WebSVN – SmartDukaan – Diff – /trunk/PyDTR/src/dtr/sources/snapdeal.py

             subOrder.trackingNumber = trackingDet.span.a.text.strip()
         subOrders.append(subOrder)
         return subOrder
-    def getOrderJSON(self, rawHtml, supcMap):
+    def getOrderJSON(self, pq, supcMap):
         #print rawHtml
 #        replace_with = {
 #        '<': '&gt;',
 #        '>': '&lt;',
 #        '&': '&amp;',
 #        '"': '&quot;', # should be escaped in attributes
 #        "'": '&apos;'    # should be escaped in attributes
 #        }
-        pq = PyQuery(rawHtml)
         jsonValue = pq("#orderJSON").attr("value")
         jsonValue.replace("&quot;", '"')
         jsonValue.replace("&amp;", '&')
         jsonValue.replace("&gt;", '>')
         jsonValue.replace("&lt;", '<')
         if self.db.merchantOrder.find_one({"merchantOrderId":moId}):
             resp['result'] = 'ORDER_ALREDY_CREATED_IGNORED'
             return resp
         supcMap = {}
         try:
+            pq = PyQuery(rawHtml)
             try:
+                if pq("title").text()=="Webpage not available":
+                    raise
-                orderJSON = self.getOrderJSON(rawHtml, supcMap)
+                orderJSON = self.getOrderJSON(pq, supcMap)
             except:
-                traceback.print_exc()
-                try:
-                    page = fetchResponseUsingProxy(orderSuccessUrl)
-                    orderJSON = self.getOrderJSON(page,supcMap)
+                resp['result'] = 'ORDER_NOT_CREATED_KNOWN'
-                except:
+                return resp
-                    traceback.print_exc()
-                    orderJSON = None
-            if orderJSON is None:
-                page =fetchResponseUsingProxy(url)
+                '''page =fetchResponseUsingProxy(url)
                 try:
                     merchantOrder = self._parseB(orderId, subTagId, userId, page, orderSuccessUrl)
                 except:
                     traceback.print_exc()
-                    merchantOrder = self._parse(orderId, subTagId, userId, page, orderSuccessUrl)
+                    merchantOrder = self._parse(orderId, subTagId, userId, page, orderSuccessUrl)'''
-            else:
-                merchantOrder = self._parseC(orderId, subTagId, userId, supcMap, orderJSON, orderSuccessUrl)
+            merchantOrder = self._parseC(orderId, subTagId, userId, supcMap, orderJSON, orderSuccessUrl)
             merchantOrder.orderTrackingUrl = url
             if self._saveToOrder(todict(merchantOrder)):
                 resp['result'] = 'ORDER_CREATED'
             else:

Subversion Repositories SmartDukaan

(root)/trunk/PyDTR/src/dtr/sources/snapdeal.py – Rev 18037 → 18038