Changeset 854 for branches/prototype-v0/zoo-project/zoo-kernel/meta_sql.c

Timestamp:

Nov 21, 2017, 10:24:14 AM (6 years ago)

Author:

djay

Message:

HPC support update. Add inputs for create options in Gdal_Dem.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/meta_sql.c (modified) (6 diffs)

branches/prototype-v0/zoo-project/zoo-kernel/meta_sql.c

@@ -297 +297 @@
  */
 elements* extractInput(maps* conf,OGRFeature *input){
-  fprintf(stderr,"************************* %s %s %d\n\n",input->GetFieldAsString( 0 ),__FILE__,__LINE__);
-  fprintf(stderr,"************************* %s %s %d\n\n",input->GetFieldAsString( 1 ),__FILE__,__LINE__);
   elements* res=createElements(input->GetFieldAsString( 1 ));
   res->content=createMap("title",input->GetFieldAsString( 2 ));
@@ -348 +346 @@
   fillMetadata(conf,&res->metadata,output->GetFieldAsString( 0 ));
   fillAdditionalParameters(conf,&res->additional_parameters,output->GetFieldAsString( 0 ));
-  res->defaults=NULL;
-  res->supported=NULL;
-  res->child=NULL;
-  res->next=NULL;
   int ioCnt=fillLiteralData(conf,res,output,"Output");
   if(ioCnt==0)
@@ -361 +355 @@
   free(nestedOutputsQuery);
   while( (noutput = noutputs->GetNextFeature()) != NULL ){
-    elements* nout=extractInput(conf,noutput);
+    elements* nout=extractOutput(conf,noutput);
     addToElements(&res->child,nout);
     freeElements(&nout);
@@ -413 +407 @@
         elements* in=extractInput(conf,input);
         if(in!=NULL){
-          if(s->inputs==NULL)
-            s->inputs=dupElements(in);
-          else
-            addToElements(&s->inputs,in);
+          addToElements(&s->inputs,in);
           freeElements(&in);
           free(in);
@@ -431 +422 @@
       while( (output = outputs->GetNextFeature()) != NULL ){
         elements* in=extractOutput(conf,output);
-        if(s->outputs==NULL)
-          s->outputs=dupElements(in);
-        else
+        if(in!=NULL){
           addToElements(&s->outputs,in);
-        freeElements(&in);
-        free(in);
+          freeElements(&in);
+          free(in);
+        }
         OGRFeature::DestroyFeature( output );
       }
@@ -463 +453 @@
                                      service *), int minimal ){
   int result=0;
-  _init_sql(conf,"metadb");
-  if(getMapFromMaps(conf,"lenv","dbIssue")!=NULL)
+  result=_init_sql(conf,"metadb");
+  if(getMapFromMaps(conf,"lenv","dbIssue")!=NULL || result < 0)
     return -1;
   // Fetch every services