Changeset 57 for trunk/zoo-kernel/service_internal.c

Timestamp:

Jan 5, 2011, 3:20:01 PM (13 years ago)

Author:

djay

Message:

Adding contains and getIoTypeFromElement functions in service.h. Remove memory leaks from the Service Configuration Parser, add the support for multiple supported formats as before. Small modification of the ZOO-Kernel Java Support, adding the capability to access the modified main_conf HashMap? from the Kernel to let lenv message map pass when an error occurs and it is handled in the Service code. Adding same capability for the ZOO-Kernel Python Support. Use strcasecmp in service.h rather than strlen+strncasecmp. Ensure that only OWS compliant informations are available for Contact.Phone and Contact.Adress. Remove memory leak in createExceptionReportNode. Correction of the addDefaultValues function to add the default format using the informations from DataInputs? if present, this should correct the behavior of the ZOO-Kernel when choosing the extension value which should now point to the corresponding zcfg value if present. Don't set the NULL value for inputs not provided in the DataInputs?, still set NULL as default value for outputs. Avoid segfault in freeElements when some zcfg values was not set correctly. Link against the client libjvm.so file rather than the server one.

File:

• trunk/zoo-kernel/service_internal.c (modified) (14 diffs)

trunk/zoo-kernel/service_internal.c

@@ -309 +309 @@
     map* tmp2=tmp4->content;
     while(tmp2!=NULL){
-      if(strncasecmp(tmp2->name,"keywords",8)!=0 &&
-         strncasecmp(tmp2->name,"serverAddress",13)!=0 &&
-         strncasecmp(tmp2->name,"lang",4)!=0 &&
-         strncasecmp(tmp2->name,"encoding",8)!=0 &&
-         strncasecmp(tmp2->name,"version",7)!=0){
+      if(strcasecmp(tmp2->name,"abstract")==0 ||
+         strcasecmp(tmp2->name,"title")==0 ||
+         strcasecmp(tmp2->name,"accessConstraints")==0 ||
+         strcasecmp(tmp2->name,"fess")==0){
         tmp2->name[0]=toupper(tmp2->name[0]);
         nc1 = xmlNewNode(ns_ows, BAD_CAST tmp2->name);
@@ -370 +369 @@
   if(tmp4!=NULL){
     map* tmp2=tmp4->content;
+    char *tmpAddress[6];
+    tmpAddress[0]="addressDeliveryPoint";
+    tmpAddress[1]="addressCity";
+    tmpAddress[2]="addressAdministrativeArea";
+    tmpAddress[3]="addressPostalCode";
+    tmpAddress[4]="addressCountry";
+    tmpAddress[5]="addressElectronicMailAddress";
+    char *tmpPhone[2];
+    tmpPhone[0]="phoneVoice";
+    tmpPhone[1]="phoneFacsimile";
     while(tmp2!=NULL){
       if(strcmp(tmp2->name,"keywords")!=0 &&
@@ -395 +404 @@
             else 
               if(strncmp(tmp2->name,"Phone",5)==0){
-                char *toto=NULL;
-                char *toto1=tmp2->name;
-                toto=strstr(toto1,"Phone");
-                nc1 = xmlNewNode(ns_ows, BAD_CAST toto1+5);
-                xmlAddChild(nc1,xmlNewText(BAD_CAST tmp2->value));
-                xmlAddChild(nc5,nc1);
+                int j;
+                for(j=0;j<2;j++)
+                  if(strlen(tmp2->name)==strlen(tmpPhone[j]) && strncasecmp(tmp2->name,tmpPhone[j],strlen(tmp2->name))==0){
+                    char *toto=NULL;
+                    char *toto1=tmp2->name;
+                    toto=strstr(toto1,"Phone");
+                    nc1 = xmlNewNode(ns_ows, BAD_CAST toto1+5);
+                    xmlAddChild(nc1,xmlNewText(BAD_CAST tmp2->value));
+                    xmlAddChild(nc5,nc1);
+                  }
               }
               else 
                 if(strncmp(tmp2->name,"Address",7)==0){
-                  char *toto=NULL;
-                  char *toto1=tmp2->name;
-                  toto=strstr(toto1,"Address");
-                  nc1 = xmlNewNode(ns_ows, BAD_CAST toto1+7);
-                  xmlAddChild(nc1,xmlNewText(BAD_CAST tmp2->value));
-                  xmlAddChild(nc6,nc1);
+                  int j;
+                  for(j=0;j<6;j++)
+                    if(strlen(tmp2->name)==strlen(tmpAddress[j]) && strncasecmp(tmp2->name,tmpAddress[j],strlen(tmp2->name))==0){
+                      char *toto=NULL;
+                      char *toto1=tmp2->name;
+                      toto=strstr(toto1,"Address");
+                      nc1 = xmlNewNode(ns_ows, BAD_CAST toto1+7);
+                      xmlAddChild(nc1,xmlNewText(BAD_CAST tmp2->value));
+                      xmlAddChild(nc6,nc1);
+                    }
                 }
         }
@@ -1084 +1101 @@
     te=getMapFromMaps(m,"lenv","message");
     if(te!=NULL)
-      addToMap(errorMap,"text",te->value);
+      addToMap(errorMap,"text",_ss(te->value));
     else
       addToMap(errorMap,"text",_("No more information available"));
@@ -1364 +1381 @@
     if(tmp1!=NULL){
       nc2 = xmlNewNode(ns_ows, BAD_CAST tmp2[j]);
-      fprintf(stderr,"[%s] \n[%s]\n",tmp1->value,_ss(tmp1->value));
       xmlAddChild(nc2,xmlNewText(BAD_CAST _ss(tmp1->value)));
       xmlAddChild(root,nc2);
@@ -1398 +1414 @@
 
 void printExceptionReportResponse(maps* m,map* s){
-  
   int buffersize;
   xmlDocPtr doc;
@@ -1425 +1440 @@
   xmlFree(xmlbuff);
   xmlCleanupParser();
+  zooXmlCleanupNs();
 }
 
@@ -1436 +1452 @@
   maps* tmpMap=getMaps(m,"main");
 
-  ns=xmlNewNs(NULL,BAD_CAST "http://www.opengis.net/ows/1.1",BAD_CAST "ows");
+  int nsid=zooXmlAddNs(NULL,BAD_CAST "http://www.opengis.net/ows/1.1",BAD_CAST "ows");
+  ns=usedNs[nsid];
   n = xmlNewNode(ns, BAD_CAST "ExceptionReport");
 
@@ -1493 +1510 @@
     if(toto!=NULL && strcasecmp(toto->value,"true")==0){
       toto=getMap(request_outputs->content,"extension");
-      /* put gml extension if the extension is defined as .js and the result will be a gml file */
-      map* mtype=getMap(request_outputs->content,"mimeType");
-      if (strcasecmp(toto->value,"js")==0 && strcasecmp(mtype->value,"text/xml")==0) {
-        toto->value="gml";
-      }
       map *tmp1=getMapFromMaps(m,"main","tmpPath");
-      char *file_name=(char*)malloc((strlen(tmp1->value)+strlen(s->name)+strlen(toto->value)+13)*sizeof(char));
+      char *file_name;
+      bool hasExt=true;
+      if(toto==NULL){
+        // We can fallback to a default list of supported formats using
+        // mimeType information if present here. Maybe we can add more formats
+        // here.
+        // If mimeType was not found, we then set txt as the default extension.
+        map* mtype=getMap(request_outputs->content,"mimeType");
+        if(mtype!=NULL){
+          if(strcasecmp(mtype->value,"text/xml")==0)
+            toto=createMap("extension","xml");
+          else
+            toto=createMap("extension","txt");
+        }
+        if(toto==NULL)
+          toto=createMap("extension","txt");
+        hasExt=false;
+      }
+      file_name=(char*)malloc((strlen(tmp1->value)+strlen(s->name)+strlen(toto->value)+13)*sizeof(char));
       sprintf(file_name,"%s/%s_%i.%s",tmp1->value,s->name,cpid+100000,toto->value);
       FILE *ofile=fopen(file_name,"w");
+      if(ofile==NULL)
+        fprintf(stderr,"Unable to create file on disk implying segfault ! \n");
       map *tmp2=getMapFromMaps(m,"main","tmpUrl");
       map *tmp3=getMapFromMaps(m,"main","serverAddress");
-      char *file_url=(char*)malloc((strlen(tmp3->value)+strlen(tmp2->value)+strlen(s->name)+strlen(toto->value)+13)*sizeof(char));
+      char *file_url;
+      file_url=(char*)malloc((strlen(tmp3->value)+strlen(tmp2->value)+strlen(s->name)+strlen(toto->value)+13)*sizeof(char));
       sprintf(file_url,"%s/%s/%s_%i.%s",tmp3->value,tmp2->value,s->name,cpid+100000,toto->value);
       addToMap(request_outputs->content,"Reference",file_url);
+      if(hasExt!=true){
+        freeMap(&toto);
+        free(toto);
+      }
       toto=getMap(request_outputs->content,"value");
-      if(toto!=NULL)
-        fwrite(toto->value,sizeof(char),strlen(toto->value),ofile);
+      if(toto!=NULL && toto->value!=NULL)
+        fwrite(toto->value,1,(strlen(toto->value)+1)*sizeof(char),ofile);
       fclose(ofile);
       free(file_name);
@@ -1601 +1638 @@
   BIO_free_all(b64);
 
-  fprintf(stderr,"BASE64 [%s] \n",buff);
   return buff;
 }
@@ -1610 +1646 @@
   while(tmpInputs!=NULL){
     maps *tmpMaps=getMaps(out1,tmpInputs->name);
+    /*fprintf(stderr,"IN LOOP\n");
+    dumpElements(tmpInputs);
+    dumpMaps(tmpMaps);
+    fprintf(stderr,"/ IN LOOP\n");*/
     if(tmpMaps==NULL){
       map* tmpMap1=getMap(tmpInputs->content,"minOccurs");
@@ -1617 +1657 @@
         }
       maps* tmpMaps2=(maps*)malloc(MAPS_SIZE);
-      tmpMaps2->name=strdup((char*)tmpInputs->name);
+      tmpMaps2->name=strdup(tmpInputs->name);
       tmpMaps2->content=NULL;
       tmpMaps2->next=NULL;
@@ -1625 +1665 @@
         tmpIoType=tmpIoType->next;
       }
-      map *tmpMap=getMap(tmpMaps2->content,"value");
-      if(tmpMap==NULL)
-        addToMap(tmpMaps2->content,"value","NULL");
+      if(strncmp(type,"outputs",7)==0){
+        map *tmpMap=getMap(tmpMaps2->content,"value");
+        if(tmpMap==NULL)
+          addToMap(tmpMaps2->content,"value","NULL");
+      }
       if(out1==NULL){
         *out=dupMaps(&tmpMaps2);
@@ -1638 +1680 @@
     }
     else{
-      map* tmpContent=tmpInputs->defaults->content;
-      
-      map* cval=NULL;
-      
-      while(tmpContent!=NULL){
-        if((cval=getMap(tmpMaps->content,tmpContent->name))==NULL){
-#ifdef DEBUG
-          fprintf(stderr,"addDefaultValues %s => %s\n",tmpContent->name,tmpContent->value);
-#endif
-          if(tmpMaps->content==NULL)
-            tmpMaps->content=createMap(tmpContent->name,tmpContent->value);
-          else
-            addToMap(tmpMaps->content,tmpContent->name,tmpContent->value);
+      iotype* tmpIoType=getIoTypeFromElement(tmpInputs,tmpInputs->name,
+                                             tmpMaps->content);
+      if(tmpIoType!=NULL){
+        map* tmpContent=tmpIoType->content;
+        map* cval=NULL;
+
+        while(tmpContent!=NULL){
+          if((cval=getMap(tmpMaps->content,tmpContent->name))==NULL){
+#ifdef DEBUG
+            fprintf(stderr,"addDefaultValues %s => %s\n",tmpContent->name,tmpContent->value);
+#endif
+              if(tmpMaps->content==NULL)
+                tmpMaps->content=createMap(tmpContent->name,tmpContent->value);
+              else
+                addToMap(tmpMaps->content,tmpContent->name,tmpContent->value);
+          }
+          tmpContent=tmpContent->next;
         }
-        tmpContent=tmpContent->next;
       }
     }