Changeset 752 for trunk/zoo-project/zoo-kernel

Timestamp:

Mar 5, 2016, 2:37:06 PM (9 years ago)

Author:

djay

Message:

Add optional CORS support. Fix issue when dealing with Array in JavaScript? support.

Location:

trunk/zoo-project/zoo-kernel

Files:

• doc/index.dox (modified) (1 diff)
• service_internal_js.c (modified) (3 diffs)
• service_internal_ms.c (modified) (1 diff)
• service_internal_saga.c (modified) (1 diff)
• zoo_service_loader.c (modified) (1 diff)

trunk/zoo-project/zoo-kernel/doc/index.dox

@@ -13 +13 @@
 Home: http://www.zoo-project.org<br>
 Download: 
- <a href="http://zoo-project.org/site/Downloads#Downloads">http at zoo-project.org</a>,
- <a href="http://zoo-project.org/site/Downloads#Fordevelopers">svn at zoo-project.org</a>
+ <a href="http://zoo-project.org/Code/Download">http at zoo-project.org</a>,
+ <a href="http://svn.zoo-project.org/svn/">svn at zoo-project.org</a>
 
 This documentation describes the ZOO-Project C-API. You can start your visit by the Data Structures link above which details all available structures in ZOO-Project. The Files link presents all source files used to generate this documentation.

trunk/zoo-project/zoo-kernel/service_internal_js.c

@@ -458 +458 @@
   while(isArray==NULL && tmpm!=NULL){
     jsval jsstr;
-    if((isBinary!=NULL && strncasecmp(tmpm->name,"value",5)==0))
+    if(isBinary!=NULL && strncasecmp(tmpm->name,"value",5)==0)
       jsstr = STRING_TO_JSVAL(JS_NewStringCopyN(cx,tmpm->value,atoi(isBinary->value)));
     else
@@ -473 +473 @@
     JSObject* values=JS_NewArrayObject( cx, cnt, NULL );
     JSObject* mvalues=JS_NewArrayObject( cx, cnt, NULL );
-    map *tmpm1,*tmpm2;
+    map *tmpm1,*tmpm2,*tmpm3;
     int i=0;
     for(i=0;i<cnt;i++){
       tmpm1=getMapArray(t,"value",i);
       tmpm2=getMapArray(t,tmap->name,i);
+      tmpm3=getMapArray(t,"size",i);
       if(tmpm1!=NULL){
-        jsval jsstr = STRING_TO_JSVAL(JS_NewStringCopyN(cx,tmpm1->value,strlen(tmpm1->value)));
+        jsval jsstr;
+        if(tmpm3!=NULL)
+          jsstr = STRING_TO_JSVAL(JS_NewStringCopyN(cx,tmpm1->value,atoi(tmpm3->value)));
+        else
+          jsstr = STRING_TO_JSVAL(JS_NewStringCopyN(cx,tmpm1->value,strlen(tmpm1->value)));
         JS_SetElement( cx, values, i, &jsstr );
       }
@@ -491 +496 @@
     JS_SetProperty(cx, res,"value",&jvalues);
     JS_SetProperty(cx, res,tmap->name,&jmvalues);
+    while(tmpm!=NULL){
+      if(strncasecmp(tmpm->name,"value",5)!=0 && strncasecmp(tmpm->name,"size",4)!=0 && strncasecmp(tmpm->name,tmap->name,strlen(tmap->name))!=0){
+        jsval jsstr = STRING_TO_JSVAL(JS_NewStringCopyN(cx,tmpm->value,strlen(tmpm->value)));
+        JS_SetProperty(cx, res, tmpm->name,&jsstr);
+      }
+#ifdef JS_DEBUG
+      fprintf(stderr,"[JS] %s => %s\n",tmpm->name,tmpm->value);
+#endif
+      tmpm=tmpm->next;
+    }
   }
   return res;

trunk/zoo-project/zoo-kernel/service_internal_ms.c

@@ -958 +958 @@
         }
       }
+      else{
+        if(nBandsI==1){
+          myLayer->offsite.red=0;
+          myLayer->offsite.green=0;
+          myLayer->offsite.blue=0;
+        }
+        msLayerAddProcessing(myLayer,"RESAMPLE=BILINEAR");
+      }
     }
     if( strlen(GDALGetRasterUnitType(hBand)) > 0 ){

trunk/zoo-project/zoo-kernel/service_internal_saga.c

@@ -559 +559 @@
   }
   else{
+#ifdef HAVE_LIBKML
     addToMap(arg,"FORMAT","LIBKML");
+#else
+    addToMap(arg,"FORMAT","KML");
+#endif
   }
   free(fext);

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -1024 +1024 @@
       setMapInMaps(m,"main","serverAddress",tmpUrl);
     }
+
+  // CORS Support
+  if(strncasecmp(cgiRequestMethod,"OPTIONS",7)==0){
+    map* cors=getMapFromMaps(m,"main","cors");
+    if(cors!=NULL && strncasecmp(cors->value,"true",4)==0){
+      char *encoding=getEncoding(m);
+      printHeaders(m);
+      printf("Content-Type: text/plain; charset=%s\r\nStatus: 200 OK\r\n\r\n",encoding);
+      printf(_("CORS is enabled.\r\n"));
+      freeMaps (&m);
+      free (m);
+      fflush (stdout);
+      return 3;
+    }
+  }
 
   //Check for minimum inputs