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

Timestamp:

Sep 29, 2012, 3:59:06 PM (12 years ago)

Author:

djay

Message:

Update to make ZOO-Kernel able to compile and run from Windows Platforms. A special thanks to Espen Messel, Knut Landmark and Benrd Härtwig for providing many patches that I can successfully apply on the SVN source tree and to Farkas for continuing requesting for ZOO-Kernel to run on Windows platforms privately and through the ZOO-Discuss mailing list.

File:

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

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

@@ -24 +24 @@
 
 #include "service_internal.h"
-
-#ifdef WIN32
-char *
-strtok_r (char *s1, const char *s2, char **lasts)
-{
-  char *ret;
-  if (s1 == NULL)
-    s1 = *lasts;
-  while (*s1 && strchr(s2, *s1))
-    ++s1;
-  if (*s1 == '\0')
-    return NULL;
-  ret = s1;
-  while (*s1 && !strchr(s2, *s1))
-    ++s1;
-  if (*s1)
-    *s1++ = '\0';
-  *lasts = s1;
-  return ret;
-}
+#ifdef USE_MS
+#include "service_internal_ms.h"
 #endif
 
@@ -1215 +1197 @@
   }
 
-  
+
 
   xmlNewProp(n,BAD_CAST "serviceInstance",BAD_CAST tmp);
@@ -1232 +1214 @@
   
   printDescription(nc,ns_ows,serv->name,serv->content);
-  fflush(stderr);
+  //fflush(stderr);
 
   xmlAddChild(n,nc);
@@ -1353 +1335 @@
     xmlAddChild(n,nc);
   }
+
 #ifdef DEBUG
   fprintf(stderr,"printProcessResponse 1 202\n");
@@ -1481 +1464 @@
   xmlAddChild(nc,nc1);
   // Extract Title required to be first element in the ZCFG file !
-  bool isTitle=true;
+  bool isTitle=TRUE;
   if(e!=NULL)
     tmp=getMap(e->content,"Title");
@@ -1625 +1608 @@
              strncmp(tmp2->value,"application/vnd.google-earth.kml",32)==0){
             xmlDocPtr doc =
-              xmlParseMemory(BAD_CAST toto->value,strlen(BAD_CAST toto->value));
+              xmlParseMemory(toto->value,strlen(toto->value));
             xmlNodePtr ir = xmlDocGetRootElement(doc);
             xmlAddChild(nc3,ir);
@@ -1634 +1617 @@
         xmlAddChild(nc2,nc3);
       }
-      else
-        xmlAddChild(nc3,xmlNewText(BAD_CAST toto->value));
+      else{
+                  xmlAddChild(nc3,xmlNewText(BAD_CAST toto->value));
+          }
     }
   }
@@ -1667 +1651 @@
     }
   }
-
   xmlAddChild(nc1,nc2);
   xmlAddChild(nc,nc1);
@@ -1826 +1809 @@
     }
   }
+
   if(asRaw==0){
 #ifdef DEBUG
@@ -1834 +1818 @@
     while(tmpI!=NULL){
 #ifdef USE_MS
-      map* testMap=getMap(tmpI->content,"useMapserver");
+      map* testMap=getMap(tmpI->content,"useMapserver");        
 #endif
       toto=getMap(tmpI->content,"asReference");
@@ -2204 +2188 @@
               char *tcn=strdup(tmpContent->name);
               for(i=1;i<atoi(length->value);i++){
+#ifdef DEBUG
                 dumpMap(tmpMaps->content);
                 fprintf(stderr,"addDefaultValues %s_%d => %s\n",tcn,i,tmpContent->value);
-                int len=strlen(tcn);
-                char *tmp1=malloc((len+10)*sizeof(char));
+#endif
+                int len=strlen((char*) tcn);
+                char *tmp1=(char *)malloc((len+10)*sizeof(char));
                 sprintf(tmp1,"%s_%d",tcn,i);
+#ifdef DEBUG
                 fprintf(stderr,"addDefaultValues %s => %s\n",tmp1,tmpContent->value);
+#endif
                 addToMap(tmpMaps->content,tmp1,tmpContent->value);
                 free(tmp1);
@@ -2406 +2394 @@
 
 
-unsigned char* getMd5(char* url){
+char* getMd5(char* url){
   EVP_MD_CTX md5ctx;
-  unsigned char* fresult=(char*)malloc((EVP_MAX_MD_SIZE+1)*sizeof(char));
+  char* fresult=(char*)malloc((EVP_MAX_MD_SIZE+1)*sizeof(char));
   unsigned char result[EVP_MAX_MD_SIZE];
   unsigned int len;
@@ -2434 +2422 @@
   map* tmp=getMapFromMaps(conf,"main","cacheDir");
   if(tmp!=NULL){
-    unsigned char* md5str=getMd5(request);
+    char* md5str=getMd5(request);
     char* fname=(char*)malloc(sizeof(char)*(strlen(tmp->value)+strlen(md5str)+6));
     sprintf(fname,"%s/%s.zca",tmp->value,md5str);
@@ -2452 +2440 @@
   map* tmpM=getMapFromMaps(conf,"main","cacheDir");
   if(tmpM!=NULL){
-    unsigned char* md5str=getMd5(request);
+    char* md5str=getMd5(request);
 #ifdef DEBUG
     fprintf(stderr,"MD5STR : (%s)\n\n",md5str);
@@ -2474 +2462 @@
  * Try to load file from cache or download a remote file if not in cache
  */
-void loadRemoteFile(maps* m,map* content,HINTERNET hInternet,char *url){
+int loadRemoteFile(maps* m,map* content,HINTERNET hInternet,char *url){
   HINTERNET res;
   char* fcontent;
@@ -2516 +2504 @@
   free(fcontent);
   free(cached);
+  return 0;
 }