Changeset 656

Timestamp:

Jun 15, 2015, 4:11:05 PM (10 years ago)

Author:

djay

Message:

Small fixes.

Location:

trunk/zoo-project/zoo-kernel

Files:

• zoo_loader.c (modified) (1 diff)
• zoo_service_loader.c (modified) (3 diffs)

trunk/zoo-project/zoo-kernel/zoo_loader.c

@@ -294 +294 @@
         if(cur->ns){
           addToMap(tmpMap,"wps_schemas",(char*)cur->ns->href);
-          xmlFree(tval);
           int j=0;
           for(j=0;j<2;j++)

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -1265 +1265 @@
 #endif
       xmlDocPtr doc = xmlNewDoc (BAD_CAST "1.0");
-      r_inputs = NULL;
-      //r_inputs = getMap (request_inputs, "ServiceProvider");
-      r_inputs = getMap (request_inputs, "version");
-      xmlNodePtr n=printGetCapabilitiesHeader(doc,m,(r_inputs!=NULL?r_inputs->value:"1.0.0"));
+      xmlNodePtr n=printGetCapabilitiesHeader(doc,m,(version!=NULL?version->value:"1.0.0"));
       /**
        * Here we need to close stdout to ensure that unsupported chars 
@@ -1290 +1287 @@
           return res;
         }
+      fflush (stdout);
       dup2 (saved_stdout, fileno (stdout));
       printDocument (m, doc, getpid ());
@@ -1363 +1361 @@
             r_inputs = NULL;
             r_inputs = getMap (request_inputs, "version");
-            map* version=getMapFromMaps(m,"main","rversion");
-            int vid=getVersionId(version->value);
             xmlNodePtr n = printWPSHeader(doc,m,"DescribeProcess",
-                                          root_nodes[vid][1],(r_inputs!=NULL?r_inputs->value:"1.0.0"),1);
+                                          root_nodes[vid][1],(version!=NULL?version->value:"1.0.0"),1);
 
             r_inputs = getMap (request_inputs, "Identifier");