Changeset 501 for trunk

Timestamp:

Sep 17, 2014, 8:49:47 PM (10 years ago)

Author:

djay

Message:

Version for testing through ogc-cite with 29 passed tests

Location:

trunk/zoo-project/zoo-kernel

Files:

• service_internal.c (modified) (1 diff)
• service_internal.h (modified) (1 diff)
• zoo_service_loader.c (modified) (4 diffs)

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

@@ -36 +36 @@
 #define FALSE -1
 #endif
+
+int isValidLang(maps* conf,const char *str){
+  map *tmpMap=getMapFromMaps(conf,"main","lang");
+  char *tmp=zStrdup(tmpMap->value);
+  char *pToken=strtok(tmp,",");
+  int res=-1;
+  while(pToken!=NULL){
+    if(strcasecmp(str,pToken)==0){
+      res=1;
+      break;
+    }
+    pToken = strtok(NULL,",");
+  }
+  free(tmp);
+  return res;
+}
 
 void printHeaders(maps* m){

trunk/zoo-project/zoo-kernel/service_internal.h

@@ -94 +94 @@
   int getServiceFromYAML(maps*,char*,service**,char *name);
   int readServiceFile(maps*, char*,service**,char *);
-  
+  int isValidLang(maps*,const char*);
 
   void printHeaders(maps*);

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

@@ -732 +732 @@
     r_inputs=getMapFromMaps(m,"main","language");
   if(r_inputs!=NULL){
+    if(isValidLang(m,r_inputs->value)<0){
+      char tmp[1024];
+      sprintf(tmp,_("The value %s is not supported for the <language> parameter"),
+              r_inputs->value);
+      errorException(m, tmp,"InvalidParameterValue","language");
+      freeMaps(&m);
+      free(m);
+      free(REQUEST);
+      return 1;
+
+    }
     char *tmp=zStrdup(r_inputs->value);
     setMapInMaps(m,"main","language",tmp);
@@ -777 +788 @@
   if(strlen(cgiServerName)>0){
     char tmpUrl[1024];
-    sprintf(tmpUrl,"http://%s%s",cgiServerName,cgiScriptName);
+    if(strncmp(cgiServerPort,"80",2)==0){
+      sprintf(tmpUrl,"http://%s%s",cgiServerName,cgiScriptName);
+    }else{
+      sprintf(tmpUrl,"http://%s:%s%s",cgiServerName,cgiServerPort,cgiScriptName);
+    }
 #ifdef DEBUG
     fprintf(stderr,"*** %s ***\n",tmpUrl);
@@ -803 +818 @@
        && strncasecmp(r_inputs->value,"DescribeProcess",15)!=0
        && strncasecmp(r_inputs->value,"Execute",7)!=0){ 
-      errorException(m, _("Unenderstood <request> value. Please check that it was set to GetCapabilities, DescribeProcess or Execute."), "InvalidParameterValue","request");
+      errorException(m, _("Unenderstood <request> value. Please check that it was set to GetCapabilities, DescribeProcess or Execute."), "OperationNotSupported",r_inputs->value);
       freeMaps(&m);
       free(m);
@@ -844 +859 @@
       }
     } 
+  }else{
+    r_inputs=getMap(request_inputs,"AcceptVersions");
+    if(r_inputs!=NULL){ 
+      if(strncmp(r_inputs->value,"1.0.0",5)!=0){
+      errorException(m, _("Unenderstood <AcceptVersions> value, 1.0.0 is the only acceptable value."), "VersionNegotiationFailed",NULL);
+        freeMaps(&m);
+        free(m);
+        free(REQUEST);
+        return 1;
+      }
+    }
   }