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

Timestamp:

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

Author:

djay

Message:

Add missing updated code from 26 ...

File:

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

trunk/zoo-kernel/service_internal.c

@@ -80 +80 @@
   }
   conf=mapsFromJSObject(cx,argv[0]);
-  dumpMaps(conf);
   if(JS_ValueToInt32(cx,argv[1],&istatus)==JS_TRUE){
     char tmpStatus[4];
@@ -350 +349 @@
   else{
     fprintf(stderr,"TMP4 NOT FOUND !!");
-    //dumpMaps(tmp4);
     return NULL;
   }
@@ -439 +437 @@
   else{
     fprintf(stderr,"TMP4 NOT FOUND !!");
-    //dumpMaps(tmp4);
   }
   xmlAddChild(nc4,nc5);
@@ -964 +961 @@
   maps* tmp_maps=getMaps(m,"main");
   if(tmp_maps!=NULL){
-    dumpMaps(getMaps(m,"lenv"));
     map* tmpm1=getMap(tmp_maps->content,"serverAddress");
     /**
@@ -1285 +1281 @@
     while(tmp!=NULL){
       if(strncasecmp(tmp->name,"value",strlen(tmp->name))!=0 &&
+         strncasecmp(tmp->name,"extension",strlen(tmp->name))!=0 &&
+         strncasecmp(tmp->name,"asReference",strlen(tmp->name))!=0 &&
+         strncasecmp(tmp->name,"status",strlen(tmp->name))!=0 &&
+         strncasecmp(tmp->name,"storeExecuteResponse",strlen(tmp->name))!=0 &&
          strncasecmp(tmp->name,"extension",strlen(tmp->name))!=0)
         xmlNewProp(nc3,BAD_CAST tmp->name,BAD_CAST tmp->value);
@@ -1306 +1306 @@
     }
     else if(tmp!=NULL){
-      if(strcmp(tmp->value,"text/js")==0)
+      if(strncmp(tmp->value,"text/js",4)==0 ||
+         strncmp(tmp->value,"application/js",14)==0)
         xmlAddChild(nc3,xmlNewCDataBlock(doc,BAD_CAST toto->value,strlen(toto->value)));
       else
@@ -1394 +1395 @@
   maps* tmpMap=getMaps(m,"main");
   char *encoding=getEncoding(tmpMap);
-  map *tmpSid=getMapFromMaps(m,"lenv","sid");
-  if(tmpSid==NULL)
+  if(m!=NULL){
+    map *tmpSid=getMapFromMaps(m,"lenv","sid");
+    if(tmpSid!=NULL){
+      if( getpid()==atoi(tmpSid->value) )
+        printf("Content-Type: text/xml; charset=%s\r\nStatus: 200 OK\r\n\r\n",encoding);
+    }
+    else
+      printf("Content-Type: text/xml; charset=%s\r\nStatus: 200 OK\r\n\r\n",encoding);
+  }else
     printf("Content-Type: text/xml; charset=%s\r\nStatus: 200 OK\r\n\r\n",encoding);
 
@@ -1534 +1542 @@
        * We get the first output only !!
        */
+      toto=getMap(request_outputs->content,"value");
+      if(toto==NULL){
+        map * errormap = createMap("text","Unable to fetch any result");
+        addToMap(errormap,"code", "InternalError");
+        fprintf(stderr,"DISPLAY ERROR MESSAGE !!!\n");
+        printExceptionReportResponse(m,errormap);
+        freeMap(&errormap);
+        free(errormap);
+      }
       char mime[1024];
       map* mi=getMap(request_outputs->content,"mimeType");
@@ -1554 +1571 @@
           sprintf(mime,"Content-Type: text/plain; charset=utf-8\r\nStatus: 200 OK\r\n\r\n");
       printf("%s",mime);
-      toto=getMap(request_outputs->content,"value");
       if(mi!=NULL && strncmp(mi->value,"image",5)==0){
         map* rs=getMapFromMaps(request_outputs,request_outputs->name,"size");
@@ -1575 +1591 @@
       errormap = createMap("text",tmp);      
       addToMap(errormap,"code", "InternalError");
-      printf("Content-Type: text/xml; charset=utf-8\r\nStatus: 200 OK\r\n\r\n");
+      fprintf(stderr,"DISPLAY ERROR MSG !!!!\n");
       printExceptionReportResponse(m,errormap);
       freeMap(&errormap);