Changeset 459 for trunk/zoo-project/zoo-kernel/service_internal.c

Timestamp:

Apr 1, 2014, 11:32:29 PM (9 years ago)

Author:

djay

Message:

Initial introduction of Value and Range in AllowedValues?, update zcfg documentation. Return valid Status code when returning ExceptionRepport?.

File:

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

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

@@ -883 +883 @@
 
 void printFullDescription(elements *elem,const char* type,xmlNsPtr ns_ows,xmlNodePtr nc1){
-  char *orderedFields[7];
+  char *orderedFields[12];
   orderedFields[0]="mimeType";
   orderedFields[1]="encoding";
@@ -891 +891 @@
   orderedFields[5]="CRS";
   orderedFields[6]="value";
-
-  xmlNodePtr nc2,nc3,nc4,nc5,nc6,nc7;
+  orderedFields[7]="AllowedValues";
+  orderedFields[8]="rangeMin";
+  orderedFields[9]="rangeMax";
+  orderedFields[10]="rangeClosure";
+  orderedFields[11]="rangeSpace";
+
+  xmlNodePtr nc2,nc3,nc4,nc5,nc6,nc7,nc8;
   elements* e=elem;
   map* tmp1=NULL;
@@ -956 +961 @@
       int dcnt=0;
       int oI=0;
-      for(oI=0;oI<7;oI++)
+      for(oI=0;oI<12;oI++)
         if((tmp1=getMap(_tmp->content,orderedFields[oI]))!=NULL){
           //while(tmp1!=NULL){
@@ -977 +982 @@
              strcasecmp(tmp1->name,"extension")!=0 &&
              strcasecmp(tmp1->name,"value")!=0 &&
-             strncasecmp(tmp1->name,"AllowedValues",13)!=0){
+             strncasecmp(tmp1->name,"AllowedValues",13)!=0&&
+             strncasecmp(tmp1->name,"range",5)!=0){
             if(datatype!=1){
               char *tmp2=zCapitalize1(tmp1->name);
@@ -993 +999 @@
           }else 
             if(strncmp(type,"Input",5)==0){
+
               if(strcmp(tmp1->name,"value")==0){
                 nc7 = xmlNewNode(NULL, BAD_CAST "DefaultValue");
                 xmlAddChild(nc7,xmlNewText(BAD_CAST tmp1->value));
                 default1=1;
+                hasDefault=true;
               }
               if(strncasecmp(tmp1->name,"AllowedValues",13)==0){
                 nc6 = xmlNewNode(ns_ows, BAD_CAST "AllowedValues");
-                fprintf(stderr,"ALLOWED VALUE %s\n",tmp1->value);
                 char *token,*saveptr1;
                 token=strtok_r(tmp1->value,",",&saveptr1);
@@ -1008 +1015 @@
                   tmps[strlen(tmps)]=0;
                   xmlAddChild(nc7,xmlNewText(BAD_CAST tmps));
-                  fprintf(stderr,"strgin : %s\n",tmps);
                   xmlAddChild(nc6,nc7);
                   token=strtok_r(NULL,",",&saveptr1);
                 }
+                if(getMap(_tmp->content,"rangeMin")!=NULL ||
+                   getMap(_tmp->content,"rangeMax")!=NULL ||
+                   getMap(_tmp->content,"rangeClosure")!=NULL )
+                  goto doRange;
                 xmlAddChild(nc3,nc6);
                 isAnyValue=-1;
               }
-              hasDefault=true;
+              if(strncasecmp(tmp1->name,"range",5)==0){
+                if(isAnyValue==1){
+                  nc6 = xmlNewNode(ns_ows, BAD_CAST "AllowedValues");
+                doRange:
+                  nc8 = xmlNewNode(ns_ows, BAD_CAST "Range");
+                  map *tmp0=getMap(tmp1,"rangeMin");
+                  if(tmp0!=NULL){
+                    nc7 = xmlNewNode(ns_ows, BAD_CAST "MinimumValue");
+                    xmlAddChild(nc7,xmlNewText(BAD_CAST tmp0->value));
+                    xmlAddChild(nc8,nc7);
+                  }else{
+                    nc7 = xmlNewNode(ns_ows, BAD_CAST "MinimumValue");
+                    xmlAddChild(nc8,nc7);
+                  }
+                  tmp0=getMap(tmp1,"rangeMax");
+                  if(tmp0!=NULL){
+                    nc7 = xmlNewNode(ns_ows, BAD_CAST "MaximumValue");
+                    xmlAddChild(nc7,xmlNewText(BAD_CAST tmp0->value));
+                    xmlAddChild(nc8,nc7);
+                  }else{
+                    nc7 = xmlNewNode(ns_ows, BAD_CAST "MaximumValue");
+                    xmlAddChild(nc8,nc7);
+                  }
+                  tmp0=getMap(tmp1,"rangeSpacing");
+                  if(tmp0!=NULL){
+                    nc7 = xmlNewNode(ns_ows, BAD_CAST "Spacing");
+                    xmlAddChild(nc7,xmlNewText(BAD_CAST tmp0->value));
+                    xmlAddChild(nc8,nc7);
+                  }
+                  tmp0=getMap(tmp1,"rangeClosure");
+                  if(tmp0!=NULL){
+                    char *tmp="closed";
+                    if(strcasecmp(tmp0->value,"co")==0)
+                      tmp="closed-open";
+                    else
+                      if(strcasecmp(tmp0->value,"oc")==0)
+                        tmp="open-closed";
+                      else
+                        if(strcasecmp(tmp0->value,"o")==0)
+                          tmp="open";
+                    xmlNewNsProp(nc8,ns_ows,BAD_CAST "rangeClosure",BAD_CAST tmp);
+                  }else
+                    xmlNewNsProp(nc8,ns_ows,BAD_CAST "rangeClosure",BAD_CAST "closed");
+                }
+                xmlAddChild(nc6,nc8);
+                xmlAddChild(nc3,nc6);
+                isAnyValue=-1;
+              }
             }
           tmp1=tmp1->next;
@@ -1026 +1083 @@
             xmlAddChild(nc3,nc5);
           }
-         
           if(strncmp(type,"Input",5)==0){
-            if(datatype==1 && isAnyValue==1 && avcnt==0){
-              xmlAddChild(nc3,xmlNewNode(ns_ows, BAD_CAST "AnyValue"));
-              hasDefault=true;
-              avcnt++;
-            }
-            if(datatype==1 && default1>0){
+            if(datatype==1 && isAnyValue==1 && default1>0){
               xmlAddChild(nc3,nc7);
             }
           }
-        }
+         
+        }
+      if(strncmp(type,"Input",5)==0){
+        if(datatype==1 && isAnyValue==1 && avcnt==0){
+          xmlAddChild(nc3,xmlNewNode(ns_ows, BAD_CAST "AnyValue"));
+          hasDefault=true;
+          avcnt++;
+        }
+      }
     }
 
@@ -1119 +1178 @@
       xmlAddChild(nc3,nc4);
       xmlAddChild(nc2,nc3);
-    }else if(datatype!=2){
-      if(hasDefault!=true && strncmp(type,"Input",5)==0)
+    }/*else if(datatype!=2){
+      if(hasDefault!=true && strncmp(type,"Input",5)==0 && isAnyValue==1)
         xmlAddChild(nc3,xmlNewNode(ns_ows, BAD_CAST "AnyValue"));
-    }
+        }*/
     
     xmlAddChild(nc1,nc2);
@@ -1772 +1831 @@
   maps* tmpMap=getMaps(m,"main");
   char *encoding=getEncoding(tmpMap);
+  char *exceptionCode;
+  
+  map* tmp=getMap(s,"code");
+  if(tmp!=NULL){
+    if(strcmp(tmp->value,"OperationNotSupported")==0)
+      exceptionCode="501 Not Implemented";
+    else
+      if(strcmp(tmp->value,"MissingParameterValue")==0 ||
+         strcmp(tmp->value,"InvalidUpdateSequence")==0 ||
+         strcmp(tmp->value,"OptionNotSupported")==0 ||
+         strcmp(tmp->value,"VersionNegotiationFailed")==0 ||
+         strcmp(tmp->value,"InvalidParameterValue")==0)
+        exceptionCode="400 Bad request";
+      else
+        if(strcmp(tmp->value,"NoApplicableCode")==0)
+          exceptionCode="501 Internal Server Error";
+        else
+          exceptionCode="501 Internal Server Error";
+  }
+  else
+    exceptionCode="501 Internal Server Error";
+
   if(m!=NULL){
     map *tmpSid=getMapFromMaps(m,"lenv","sid");
@@ -1777 +1858 @@
       if( getpid()==atoi(tmpSid->value) ){
         printHeaders(m);
-        printf("Content-Type: text/xml; charset=%s\r\nStatus: 200 OK\r\n\r\n",encoding);
+        printf("Content-Type: text/xml; charset=%s\r\nStatus: %s\r\n\r\n",encoding,exceptionCode);
       }
     }
     else{
       printHeaders(m);
-      printf("Content-Type: text/xml; charset=%s\r\nStatus: 200 OK\r\n\r\n",encoding);
+      printf("Content-Type: text/xml; charset=%s\r\nStatus: %s\r\n\r\n",encoding,exceptionCode);
     }
   }else{
-    printf("Content-Type: text/xml; charset=%s\r\nStatus: 200 OK\r\n\r\n",encoding);
+    printf("Content-Type: text/xml; charset=%s\r\nStatus: %s\r\n\r\n",encoding,exceptionCode);
   }
   n=createExceptionReportNode(m,s,1);
@@ -1829 +1910 @@
   else
     xmlNewProp(nc,BAD_CAST "exceptionCode",BAD_CAST "NoApplicableCode");
+
+  tmp=getMap(s,"locator");
+  if(tmp!=NULL && strcasecmp(tmp->value,"NULL")!=0)
+    xmlNewProp(nc,BAD_CAST "locator",BAD_CAST tmp->value);
+
 
   tmp=getMap(s,"text");
@@ -2630 +2716 @@
     fcontent=(char*)malloc((res.nDataLen+1)*sizeof(char));
     if(fcontent == NULL){
-      return errorException(m, _("Unable to allocate memory."), "InternalError");
+      return errorException(m, _("Unable to allocate memory."), "InternalError",NULL);
     }
     size_t dwRead;
@@ -2639 +2725 @@
   }
   if(fsize==0){
-    return errorException(m, _("Unable to download the file."), "InternalError");
+    return errorException(m, _("Unable to download the file."), "InternalError",NULL);
   }
 
@@ -2668 +2754 @@
 }
 
-int errorException(maps *m, const char *message, const char *errorcode) 
+int errorException(maps *m, const char *message, const char *errorcode, const char *locator) 
 {
   map* errormap = createMap("text", message);
   addToMap(errormap,"code", errorcode);
+  if(locator!=NULL)
+    addToMap(errormap,"locator", locator);
+  else
+    addToMap(errormap,"locator", "NULL");
   printExceptionReportResponse(m,errormap);
   freeMap(&errormap);