Changeset 32 for trunk/zoo-services

Timestamp:

Sep 27, 2010, 10:09:32 PM (14 years ago)

Author:

djay

Message:

Add missing updated code from 26 ...

Location:

trunk/zoo-services

Files:

• ogr/base-vect-ops/service.c (modified) (1 diff)
• utils/status/cgi-env/updateStatus.xsl (added)
• utils/status/service.c (modified) (2 diffs)

trunk/zoo-services/ogr/base-vect-ops/service.c

@@ -246 +246 @@
    OGRGeometryH geometry,res;
    map* tmp=getMapFromMaps(inputs,"InputPolygon","value");
-   if(tmp==NULL)
+   if(tmp==NULL){
+     setMapInMaps(conf,"lenv","message","Unable to fetch input geometry");
      return SERVICE_FAILED;
+   }else
+     if(strlen(tmp->value)<=0){
+       setMapInMaps(conf,"lenv","message","Unable to fetch input geometry");
+       return SERVICE_FAILED;
+     }
    map* tmp1=getMapFromMaps(inputs,"InputPolygon","mimeType");
    if(strncmp(tmp1->value,"application/json",16)==0)

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

@@ -64 +64 @@
     DIR *dirp = opendir(tmpTmap->value);
     char fileName[1024],xslFileName[1024];
+    int hasFile=-1;
     if(dirp!=NULL){
       char tmp[128];
       sprintf(tmp,"_%s.xml",tmpMap->value);
       while ((dp = readdir(dirp)) != NULL)
-        if(strstr(dp->d_name,tmp)!=0)
+        if(strstr(dp->d_name,tmp)!=0){
           sprintf(fileName,"%s/%s",tmpTmap->value,dp->d_name);
-    }else{  
-      setMapInMaps(conf,"lenv","message","GetStatus was unable to use the tmpPath value set in main.cfg file.");
+          hasFile=1;
+        }
+    }else{
+      char tmp[1024];
+      snprintf(tmp,1024,"GetStatus was unable to use the tmpPath value set in main.cfg file as directory %s.",tmpTmap->value);
+      setMapInMaps(conf,"lenv","message",tmp);
+      return SERVICE_FAILED;
+    }
+    if(hasFile<0){
+      char tmp[1024];
+      snprintf(tmp,1024,"GetStatus was unable to find any cache file for Service ID %s.",tmpMap->value);
+      setMapInMaps(conf,"lenv","message",tmp);
       return SERVICE_FAILED;
     }
@@ -94 +105 @@
       xmlFree(xmlbuff);
     }
-    else{   
+    else{
       char tmp[1024];
-      sprintf(tmp,"ZOO GetStatus Service was unable to find or parse the cache xml file available for the Service ID %s.",tmpMap->value);
+      sprintf(tmp,"ZOO GetStatus Service was unable to parse the cache xml file available for the Service ID %s.",tmpMap->value);
       setMapInMaps(conf,"lenv","message",tmp);
       return SERVICE_FAILED;