Changeset 897 for branches/prototype-v0/zoo-project/zoo-kernel/zoo_service_loader.c

Timestamp:

Mar 21, 2019, 4:14:14 PM (5 years ago)

Author:

djay

Message:

Add information abouut semaphore status for future deletion. Make sure to store on disk inputs passed by reference in case no specific memory=load has been set in the [main] section. Fix ticket #170. Add support for publishing raster applying a style definition found in the metadata (zcfg or database).

File:

• branches/prototype-v0/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (5 diffs)

branches/prototype-v0/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -1307 +1307 @@
   registry* zooRegistry=NULL;
   if(reg!=NULL){
+#ifndef WIN32
     int saved_stdout = zDup (fileno (stdout));
     zDup2 (fileno (stderr), fileno (stdout));
+#endif
     if(createRegistry (m,&zooRegistry,reg->value)<0){
       map *message=getMapFromMaps(m,"lenv","message");
@@ -1317 +1319 @@
       return 0;
     }
+#ifndef WIN32
     zDup2 (saved_stdout, fileno (stdout));
     zClose(saved_stdout);
+#endif
   }
 
@@ -1770 +1774 @@
                         free (REQUEST);
                         closedir (dirp);
-                        //xmlFreeDoc (doc);
+                        if (corig != NULL)
+                          free (corig);
+                        xmlFreeDoc (doc);
                         xmlCleanupParser ();
                         zooXmlCleanupNs ();
@@ -1779 +1785 @@
                     if (corig != NULL)
                       free (corig);
-                  }
+                  }               
               }
             closedir (dirp);
@@ -2062 +2068 @@
 #endif
 #endif
+
 #ifdef DEBUG
           fprintf (stderr, "[ZOO: setenv (%s=%s)]\n", mapcs->name,