Changeset 79663

Timestamp:

06/22/11 13:49:33 (4 years ago)

Author:

derek@…

Message:

• Use stats_url and stats_id from macports.conf
• Submit stats_id along with other data
• Added checks for existence of those two variables before using them

File:

• branches/gsoc11-statistics/base/src/port/port.tcl (modified) (4 diffs)

branches/gsoc11-statistics/base/src/port/port.tcl

@@ -2589 +2589 @@
             set entry "\"$name\":\"$port($name)\"" 
             set json "$json$entry"
-
-
         }
 
@@ -2627 +2625 @@
     # Top level container for os and port data
     # Returns a JSON Object with three  
-    proc json_encode_stats {os_dict ports_dict} {
+    proc json_encode_stats {id os_dict ports_dict} {
         upvar 1 $os_dict os
         upvar 1 $ports_dict ports
@@ -2636 +2634 @@
 
         set json "\{"
+        set json "$json \"id\":\"$id\","
         set json "$json \"os\":$os_json,"
         set json "$json \"active_ports\":$active_ports_json,"
@@ -2644 +2643 @@
     }
 
+
     switch $cmd {
         "submit" {
-            # TODO: Get URL from a configuration variable
-            set url "http://127.0.0.1/cgi-bin/data.py"
-            set json [json_encode_stats os ports]
-            curl post "data=$json" $url      
+            if {![info exists macports::stats_url]} {
+                ui_error "Configuration variable stats_url is not set"
+                return 0
+            }
+            if {![info exists macports::stats_id]} {
+                ui_error "Configuration variable stats_id is not set"
+                return 0
+            }
+            
+            set json [json_encode_stats ${macports::stats_id} os ports]
+            curl post "data=$json" ${macports::stats_url}  
         }
         default {