m_khoj.rb in rmobio-1.1.22

- old
+ new
@@ -24,25 +24,20 @@
 module Rmobio
   module Ads
     module MKhoj
       
       
-      def getAd(keywords,adClient)
-        getAdByPage(adClient) # keywords have no effect in mKhoj 
+      def getAd(keywords,adClient,ip=request.remote_ip,url=request.request_uri,useragent=request.user_agent)
+        getAdByPage(adClient,ip,url,useragent) # keywords have no effect in mKhoj 
       end
       
-      def getAdByPage(adClient)
+      def getAdByPage(adClient,ip=request.remote_ip,url=request.request_uri,useragent=request.user_agent)
         # mKhoj just detects your URL, so you don't really need an adClient variable for this particular network!
-        # but we have it here for consistency
-        handset = request.user_agent if request.user_agent
-        # handset="nokia6030/"
-        handset = URI.escape(handset)
-        #carrier = URI.escape(request.remote_ip)
-        carrier="59.181.113.59" # only works with India carriers!!
+        #carrier="59.181.113.59" # only works with India carriers!!
         
-        adUrl="http://www.mkhoj.com/view/Traffic/ShowAd.aspx?siteId=330ed28f-0de9-4c4f-b0a8-1f2118358c80&handset=nokia6030/&carrier=59.181.113.59"
+        adUrl = "http://www.mkhoj.com/view/Traffic/ShowAd.aspx?siteId=330ed28f-0de9-4c4f-b0a8-1f2118358c80&handset="+URI.escape(useragent)+"&carrier="+ip   
+        #adUrl="http://www.mkhoj.com/view/Traffic/ShowAd.aspx?siteId=330ed28f-0de9-4c4f-b0a8-1f2118358c80&handset=nokia6030/&carrier=59.181.113.59"
         logger.info "Calling: " + adUrl
-        #adUrl = "http://www.mkhoj.com/view/Traffic/ShowAd.aspx?siteId=330ed28f-0de9-4c4f-b0a8-1f2118358c80&handset="+handset+"&carrier="+carrier   
         begin
           @ad = open(adUrl).read   
           logger.info "Returned ad: " + @ad
         rescue
         end 
\ No newline at end of file