Changeset 366 for trunk

Timestamp:

Oct 3, 2012, 11:13:57 AM (12 years ago)

Author:

djay

Message:

Fix the two target for service_internal_java.obj, thanks to Farkas for his comment. FIx issue when outputing raster data to make sure that if there is no projection that the layer will be added to the mapfile.

Location:

trunk/zoo-project/zoo-kernel

Files:

• makefile.vc (modified) (1 diff)
• service_internal_ms.c (modified) (4 diffs)

trunk/zoo-project/zoo-kernel/makefile.vc

@@ -49 +49 @@
         $(CPP) /c $(CFLAGS) service_internal_ms.c
 
-service_internal_java.obj: service_internal_java.c service.h
-        $(CPP) /c $(CFLAGS) $(CJFLAGS) service_internal_java.c
-
 service_loader.obj: service_loader.c service.h
         $(CPP) /c $(CFLAGS)  service_loader.c

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

@@ -624 +624 @@
   if( hDataset == NULL ){
 #ifdef DEBUGMS
-    fprintf(stderr,"Unable to access the DataSource \n");
+    fprintf(stderr,"Unable to access the DataSource %s \n",pszFilename);
 #endif
     setMapInMaps(conf,"lenv","message","gdalinfo failed - unable to open");
@@ -631 +631 @@
   }
 #ifdef DEBUGMS
-  fprintf(stderr,"Accessing the DataSource %s\n",__LINE__);
+    fprintf(stderr,"Accessing the DataSource %s %d\n",pszFilename,__LINE__);
 #endif
 
@@ -677 +677 @@
    * proj4 definition if available or fallback to default EPSG:4326
    */
-  if( GDALGetProjectionRef( hDataset ) != NULL ){
+  const char *tRef=GDALGetProjectionRef( hDataset );
+  if( tRef != NULL && strlen(tRef)>0 ){
     OGRSpatialReferenceH  hSRS;
     char *pszProjection;
@@ -685 +686 @@
 #endif
     setSrsInformations(output,m,myLayer,pszProjection);
-  }
+    }