Changeset 471 for trunk/zoo-project/zoo-services

Timestamp:

May 10, 2014, 4:23:03 PM (11 years ago)

Author:

djay

Message:

Remove leaks from DescribeProcess? and JavaScript? support. Fix wrong ulinet update on previous commit. Use the new updateStatus/setOutputValue functions as described in #88 from longProcess. Add default value for QREncode service in ZCFG. Fix name of profile service in the ZCFG file.

Location:

trunk/zoo-project/zoo-services

Files:

• gdal/profile/cgi-env/GdalExtractProfile.zcfg (modified) (1 diff)
• qrencode/Makefile (modified) (1 diff)
• qrencode/cgi-env/QREncode.zcfg (modified) (3 diffs)
• utils/status/service.c (modified) (4 diffs)

trunk/zoo-project/zoo-services/gdal/profile/cgi-env/GdalExtractProfile.zcfg

@@ -6 +6 @@
  statusSupported = true
  serviceType = C
- serviceProvider = gdal_profile_service.zo
+ serviceProvider = profile_service.zo
  <MetaData>
    title = My Demo

trunk/zoo-project/zoo-services/qrencode/Makefile

@@ -5 +5 @@
 
 cgi-env/qrencode.zo: qrenc-service.c
-        g++ -DZOO_SERVICE_PROVIDER ${CFLAGS} -shared -fpic -o cgi-env/qrencode.zo ./qrenc-service.c -lqrencode ${GDAL_LIBS} ${MACOS_LD_FLAGS}
+        g++ -DZOO_SERVICE_PROVIDER ${CFLAGS} -shared -fpic -o cgi-env/qrencode.zo ./qrenc-service.c -lqrencode ${GDAL_LIBS} -lpng ${MACOS_LD_FLAGS}
 
 clean:

trunk/zoo-project/zoo-services/qrencode/cgi-env/QREncode.zcfg

@@ -29 +29 @@
    <LiteralData>
     dataType = string
-    <Default />
+    <Default>
+     value=000000
+    </Default>
    </LiteralData>
   [bgcolor]
@@ -38 +40 @@
    <LiteralData>
     dataType = string
-    <Default />
+    <Default>
+     value=ffffff
+    </Default>
    </LiteralData>
   [size]
@@ -47 +51 @@
    <LiteralData>
     dataType = integer
-    <Default />
+    <Default>
+     value=3
+    </Default>
    </LiteralData>
  </DataInputs>

trunk/zoo-project/zoo-services/utils/status/service.c

@@ -104 +104 @@
        */
       char *tmpStr=getStatus(atoi(tmpMap->value));
+      fprintf(stderr,"DEBUG: %s \n",tmpStr);
       if(tmpStr!=NULL && strncmp(tmpStr,"-1",2)!=0){
         char *tmpStr1=strdup(tmpStr);
@@ -121 +122 @@
         setMapInMaps(outputs,"Result","value",(char*)xmlbuff);
         xmlFree(xmlbuff);
-        free(tmpStr);
         free(tmpStr1);
         free(tmpStr0);
@@ -154 +154 @@
     int i=0;
     while(i<100){
-      char tmp[4];
       char message[10];
-      sprintf(tmp,"%i",i);
-      map* tmpMap=NULL;
-      tmpMap=getMapFromMaps(conf,"lenv","sid");
-      if(tmpMap!=NULL)
-        fprintf(stderr,"Status %s %s\n",tmpMap->value,tmp);
       sprintf(message,"Step %d",i);
-      setMapInMaps(conf,"lenv","status",tmp);
-      setMapInMaps(conf,"lenv","message",message);
-      updateStatus(conf);
+      updateStatus(conf,i,message);
 #ifndef WIN32
       sleep(1);
@@ -172 +164 @@
       i+=5;
     }
-    setMapInMaps(outputs,"Result","value","\"Running long process successfully\"");
+    setOutputValue(outputs,"Result","\"Long process run successfully\"",-1);
     return SERVICE_SUCCEEDED;
   }