Changeset 18058 for trunk/FACT++/dim/src/webDid/webServer.c

Timestamp:

01/03/15 18:26:23 (10 years ago)

Author:

tbretz

Message:

Updated to v20r11

File:

• trunk/FACT++/dim/src/webDid/webServer.c (modified) (5 diffs)

trunk/FACT++/dim/src/webDid/webServer.c

@@ -257 +257 @@
         if(type == 0)
         {
-          ptr = getJSONHeader();
+          ptr = getJSONHeader(0);
         }
         else if(type == 1)
@@ -350 +350 @@
         char node[128], server[256], service[256];
         int pid, ret, req, browser, force;
-        extern char *update_services();
+        extern char *update_services(), *update_smi_objects();
         extern char *update_service_data();
         extern char *getJSONHeader();
-        extern char *getJSONBuffer();
+        extern char *getJSONBuffer(), *getJSONSmiBuffer();
         char datatype[128];
         char *conv_buffer;
@@ -361 +361 @@
         if(type == 0)
         {
-          ptr = getJSONHeader();
+          ptr = getJSONHeader(1);
         }
         else if(type == 1)
         {
             ret = getNodeParameters(conv_buffer, node, &browser);
-                ptr = getJSONBuffer(node, browser);
+                ptr = getJSONSmiBuffer(node, browser);
         }
         else if(type == 2)
@@ -378 +378 @@
                 else
                 {
-                        ptr = update_services(node, server, pid, browser);
+                        ptr = update_smi_objects(node, server, pid, browser);
                 }
         }
@@ -550 +550 @@
                                 return;
                         }
-                        else if(!strncmp(&buffer[5],"smiObjects",11))
+                        else if(!strncmp(&buffer[5],"smiData",7))
+                        {
+                                sendSmiData(conn_id, &buffer[5], 1);
+                                return;
+                        }
+                        else if(!strncmp(&buffer[5],"smiObjects",10))
                         {
                                 sendSmiData(conn_id, &buffer[5], 2);