Commit ecaf873d authored by Robert Butora's avatar Robert Butora
Browse files

eliminates DataLink useage in MCutout and Merge

parent 244816c6

data-access/servlet/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ AUTHFILTERS = $(wildcard $(AUTH_DIR)/src/main/java/*Filter.java) $(AUTH_DIR)/sr 
FILTERS  = $(wildcard src/main/java/webapi/*Filter.java)

FILTERS  += $(wildcard src/main/java/authz/*Filter.java)

SERVLETS = $(wildcard src/main/java/webapi/Servlet*.java)

UWS = $(wildcard src/main/java/webapi/UWSMCutout.java)

UWS += $(wildcard src/main/java/webapi/UWSMerge.java)

#SERVLETS = $(wildcard src/main/java/webapi/*Servlet.java)

#===============================================================================

JFLAGS = -g
@@ -26,7 +28,7 @@ CLASSPATH = $(LIB_DIR)/* 
.PHONY: build

build:

	echo "class Version { static String asString = \"$(VERSION)\";}" > src/main/java/Version.java

	javac $(JFLAGS) -cp :$(CLASSPATH) -sourcepath $(SRC_DIR) -d $(CLASS_DIR) $(SERVLETS) $(FILTERS) $(AUTHFILTERS) $(VOSI)

	javac $(JFLAGS) -cp :$(CLASSPATH) -sourcepath $(SRC_DIR) -d $(CLASS_DIR) $(SERVLETS) $(FILTERS) $(AUTHFILTERS) $(VOSI) $(UWS)



.PHONY: clean

clean :

data-access/servlet/src/main/java/cutout/DatasetsImpl.java

+3 −2
Original line number Diff line number Diff line
@@ -154,10 +154,11 @@ class DatasetsImpl implements Datasets 
         String publisherDid, Coord coord,

         boolean countNullValues)

   {

      ResolverByObsCore rsl = new ResolverByObsCore(settings.dbConn, subsurveys);

     // ResolverByObsCore rsl = new ResolverByObsCore(settings.dbConn, subsurveys);

      Resolver rsl = new ResolverFromId();//settings.dbConn, subsurveys);

      rsl.resolve(publisherDid);



      FitsCard[] extraCards = Subsurvey.subsurveysFindCards(subsurveys, rsl.obsCollection());//rsl.subsurveyId);

      FitsCard[] extraCards = null;//Subsurvey.subsurveysFindCards(subsurveys, rsl.obsCollection());//rsl.subsurveyId);

      String absSubimgPathname = settings.fitsPaths.cutouts() + "/" + generateSubimgPathname(rsl.relPathname(), rsl.hdunum());

      LOGGER.info("absSubimgPathname: " + absSubimgPathname);

data-access/servlet/src/main/java/cutout/json/JdlMCutout.java

+3 −2
Original line number Diff line number Diff line
@@ -32,10 +32,11 @@ public class JdlMCutout 


            FitsCard[] extraCards = null;



            ResolverByObsCore rsl = new ResolverByObsCore(settings.dbConn, subsurveys);

            Resolver rsl = new ResolverFromId();//settings.dbConn, subsurveys);

            //ResolverByObsCore rsl = new ResolverByObsCore(settings.dbConn, subsurveys);

            rsl.resolve(publisherDid);



            extraCards = Subsurvey.subsurveysFindCards(subsurveys, rsl.obsCollection());//subsurveyId);

            extraCards = null;// Subsurvey.subsurveysFindCards(subsurveys, rsl.obsCollection());//subsurveyId);



            /* add resolved info to json */

data-access/servlet/src/main/java/webapi/ServletMCutout.java

+27 −3
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ public class ServletMCutout extends javax.servlet.http.HttpServlet 


         OutputStream respOutputStream = response.getOutputStream();



         MCutResult mCutRes = datasets.doMCutout(reqJsonString);

         DataLink dlk = new DataLink(mCutRes);

         MCutResult result = datasets.doMCutout(reqJsonString);

       //  DataLink dlk = new DataLink(mCutRes);



         final String contentType = "text/xml"; // FIXME

         final String respEncoding = "utf-8"; // FIXME
@@ -105,7 +105,19 @@ public class ServletMCutout extends javax.servlet.http.HttpServlet 
         {

            //LOGGER.info("writing xml");

            PrintWriter writer = new PrintWriter(new OutputStreamWriter(respOutputStream, respEncoding));

            XmlSerializer.serializeToLegacyCutResults(writer, respEncoding, dlk, showDuration, startTime_msec);

         // XmlSerializer.serializeToLegacyCutResults(writer, respEncoding, dlk, showDuration, startTime_msec);





            String accessUrl = convertLocalPathnameToRemoteUrl(result.fileName,

                  settings.fitsPaths.cutouts(),

                  settings.fitsPaths.cutoutsUrl());



            XmlSerializer.serializeToLegacyCutResult(writer, respEncoding,

                  result, accessUrl,

                  //id, pos, band, time, pol, pixels, countNullValues,

                  showDuration, startTime_msec);





            writer.close();

         }

         else if(contentType.equals("application/tar.gz")) // FIXME mime for tgz ?
@@ -133,5 +145,17 @@ public class ServletMCutout extends javax.servlet.http.HttpServlet 
      }

   }



  private String convertLocalPathnameToRemoteUrl(String localPathname,

         String FITScutpath, String FITSRemoteUrlCutouts)

   {   

      LOGGER.info("trace " + localPathname);

      String fileName = localPathname.replaceAll(FITScutpath + "/", "");

      LOGGER.info("local filename: " + fileName);

      String remotefname = FITSRemoteUrlCutouts + "/" + fileName;

      LOGGER.info("remote url    : " + remotefname);

      return remotefname;

   }   





}

data-access/servlet/src/main/java/webapi/UWSMCutoutWork.java

+28 −5
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import org.json.simple.parser.ParseException; 


public class UWSMCutoutWork extends JobThread

{

   final String RESP_ENCODING = "utf-8";

   final String RESPONSE_ENCODING = "utf-8";



   private Settings settings = UWSMCutout.settings;
@@ -83,13 +83,24 @@ public class UWSMCutoutWork extends JobThread 


            /* SODA -> Implementation */



            MCutResult mCutResults = datasets.doMCutout(reqJsonString);

            DataLink dlk = new DataLink(mCutResults);

            MCutResult mresult = datasets.doMCutout(reqJsonString);

        //DataLink dlk = new DataLink(mCutResults);



            /* Implement -> SODA */



            PrintWriter writer = new PrintWriter(new OutputStreamWriter(respOutputStream, RESP_ENCODING));

            XmlSerializer.serializeToLegacyCutResults(writer, RESP_ENCODING, dlk, showDuration, startTime_msec);

            PrintWriter writer = new PrintWriter(new OutputStreamWriter(respOutputStream, RESPONSE_ENCODING));



        //XmlSerializer.serializeToLegacyCutResults(writer, RESPONSE_ENCODING, dlk, showDuration, startTime_msec);



            String accessUrl = convertLocalPathnameToRemoteUrl(mresult.fileName,

                  settings.fitsPaths.cutouts(),

                  settings.fitsPaths.cutoutsUrl());



            XmlSerializer.serializeToLegacyCutResult(writer, RESPONSE_ENCODING,

                  mresult, accessUrl,

                  //id, pos, band, time, pol, pixels, countNullValues,

                  showDuration, startTime_msec);



            writer.close();



            /* SODA -> UWS */
@@ -109,4 +120,16 @@ public class UWSMCutoutWork extends JobThread 
      }

   }



  private String convertLocalPathnameToRemoteUrl(String localPathname,

         String FITScutpath, String FITSRemoteUrlCutouts)

   {

      //LOGGER.info("trace " + localPathname);

      String fileName = localPathname.replaceAll(FITScutpath + "/", "");

      //LOGGER.info("local filename: " + fileName);

      String remotefname = FITSRemoteUrlCutouts + "/" + fileName;

      //LOGGER.info("remote url    : " + remotefname);

      return remotefname;

   }





}