Index: branches/eam_branches/ipp-20130307/Ohana/src/libdvo/src/dbExtractMeasures.c
===================================================================
--- branches/eam_branches/ipp-20130307/Ohana/src/libdvo/src/dbExtractMeasures.c	(revision 35310)
+++ branches/eam_branches/ipp-20130307/Ohana/src/libdvo/src/dbExtractMeasures.c	(revision 35312)
@@ -468,5 +468,9 @@
       ra  = average[0].R - measure[0].dR / 3600.0;
       dec = average[0].D - measure[0].dD / 3600.0;
-      mosaic = MatchMosaicMetadata (measure[0].imageID);
+      if (REMOTE_CLIENT) {
+	mosaic = MatchMosaicMetadata (measure[0].imageID);
+      } else {
+	mosaic = MatchMosaic (measure[0].t, measure[0].photcode);
+      }
       if (mosaic == NULL) break;
       RD_to_XY (&x, &y, ra, dec, mosaic);
@@ -476,5 +480,9 @@
       ra  = average[0].R - measure[0].dR / 3600.0;
       dec = average[0].D - measure[0].dD / 3600.0;
-      mosaic = MatchMosaic (measure[0].t, measure[0].photcode);
+      if (REMOTE_CLIENT) {
+	mosaic = MatchMosaicMetadata (measure[0].imageID);
+      } else {
+	mosaic = MatchMosaic (measure[0].t, measure[0].photcode);
+      }
       if (mosaic == NULL) break;
       RD_to_XY (&x, &y, ra, dec, mosaic);