/ - Diff - Metacat - Ecoinformatics Redmine

         docs = new Vector();
+      }
       public MetacatSpatialDocument getDocument(int _id) {
         return (MetacatSpatialDocument)docs.elementAt(_id);
+      }
       /*
        * Adds a new MetacatSpatialDocument to this dataset
        */
-...
         // write the data stored in this object using the persistent layer
         PersistentMetacatSpatialDataset _writer = new PersistentMetacatSpatialDataset();
          _writer.writeTextQueryData(this);
          _writer.writeTextQueryData(this);
+      }

     import com.oreilly.servlet.multipart.Part;
     import edu.ucsb.nceas.utilities.Options;
     import edu.ucsb.nceas.metacat.spatial.MetacatSpatialQuery;
     import edu.ucsb.nceas.metacat.spatial.MetacatSpatialDocument;
     import edu.ucsb.nceas.metacat.spatial.MetacatSpatialDataset;
     /**
      * A metadata catalog server implemented as a Java Servlet
-...
                     PrintWriter out = response.getWriter();
                     handleLoginAction(out, params, request, response);
                     out.close();
+                }
                 else if (action.trim().equals("spatial_query") ) {
                   logMetacat.fatal("******************* SPATIAL QUERY ********************");
                   logMetacat.fatal("******************* SPATIAL QUERY ********************");
                   logMetacat.fatal("******************* SPATIAL QUERY ********************");
                   logMetacat.fatal("******************* SPATIAL QUERY ********************");
                   logMetacat.fatal("******************* SPATIAL QUERY ********************");
                   handleSpatialQuery(params, request, response);
                     // handle logout action
                 } else if (action.equals("logout")) {
                     PrintWriter out = response.getWriter();
-...
+            }
+        }
         /////////////////////////////// METACAT SPATIAL ///////////////////////////
         /**
          * handles all spatial queries -- these queries may include any of the
          * queries supported by the WFS / WMS standards
          */
         private void handleSpatialQuery(Hashtable params,
                                         HttpServletRequest request,
                                         HttpServletResponse response) {
           Logger logMetacat = Logger.getLogger(MetaCatServlet.class);
           MetacatSpatialQuery _spatialQuery = new MetacatSpatialQuery();
           PrintWriter out;
           try {
             out = response.getWriter();
           // switch -- html/xml print
           boolean printXML = false;
           // get the spatial parameters
           logMetacat.warn("params: " +  params);
           //String _xmax =  (String)params.get("XMAX");
           float _xmax = Float.parseFloat( ((String[]) params.get("XMAX"))[0] );
           float _ymax = Float.parseFloat( ((String[]) params.get("YMAX"))[0] );
           float _xmin = Float.parseFloat( ((String[]) params.get("XMIN"))[0] );
           float _ymin = Float.parseFloat( ((String[]) params.get("YMIN"))[0] );
           logMetacat.warn("\nxmax: " + _xmax + " \nymax:" + _ymax +
                           "\nxmin: " + _xmin + "\nymin: " + _ymin);
           // is it UTM or lat/long
           // issue the query
           MetacatSpatialDataset _data =
             _spatialQuery.queryDatasetByCartesianBounds(_xmin, _ymin, _xmax, _ymax);
           // return the list of docs and point at the spatial theme
           if ( printXML) {
             response.setContentType("text/xml");
             out.println("<?xml version=\"1.0\"?>");
             out.println("<urllist>");
             //for all data (print url approximations)
             for (int i = 0; i < _data.size(); i++) {
               out.println("<docid>"+(_data.getDocument(i)).getDocid()+"</docid>");
               out.println("<url>"+request.getRequestURL()+(_data.getDocument(i)).getDocid()+"</url>");
+            }
             out.println("</urllist>");
             out.close();
           } else {
             response.setContentType("text/html");
             out.println("<html>\n<body>");
             //for all data (print url approximations)
             for (int i = 0; i < _data.size(); i++) {
               //format like: metacat?action=read&docid=dpennington.38.6&qformat=knb
               out.println("<a href=\""+request.getRequestURL()+"?action=read&docid="+(_data.getDocument(i)).getDocid()+"\">  "+(_data.getDocument(i)).getDocid()+"</a> <br>");
+            }
             out.println("</html>\n</body>");
             out.close();
+          }
           } catch (IOException ioe) { ioe.printStackTrace(); }
           return;
+        }
         // LOGIN & LOGOUT SECTION
         /**
          * Handle the login request. Create a new session object. Do user
-...
                 return;
+            }
             //}
             if(params.get("password") == null){
                 response.setContentType("text/xml");
                 out.println("<?xml version=\"1.0\"?>");
-...
+            }
             //logMetacat.debug("The docid will be read is "+newAccNum);
             return newAccNum;
+        }
+      }
+    }

     import org.xml.sax.SAXParseException;
     import org.xml.sax.helpers.XMLReaderFactory;
     import edu.ucsb.nceas.metacat.spatial.MetacatSpatialDocument;
     /**
      * This class a wrapper class for documentimpl for insert or update. It will
      * provide deferent parser base on xml document validation by dtd or schema
-...
                           String action, String docid, String user, String[] groups)
                           throws Exception
+      {
         //jhh register this transaction with the Metacat Spatial Option
         MetacatSpatialDocument msdoc = new MetacatSpatialDocument(docid);
         return DocumentImpl.write(conn, xml, pub, dtd, action, docid, user,
                                   groups, ruleBase, needValidation);
+      }

     import edu.ucsb.nceas.morpho.datapackage.Triple;
     import edu.ucsb.nceas.morpho.datapackage.TripleCollection;
     import edu.ucsb.nceas.metacat.spatial.MetacatSpatialQuery;
     import edu.ucsb.nceas.metacat.spatial.PersistentMetacatSpatialDataset;
     import edu.ucsb.nceas.metacat.spatial.MetacatSpatialDataset;
     import edu.ucsb.nceas.metacat.spatial.MetacatSpatialDocument;
     /**
      * A Class that searches a relational DB for elements and attributes that have
      * free text matches a query string, or structured query matches to a path
-...
         private Logger logMetacat = Logger.getLogger(DBQuery.class);
         /** true if the metacat spatial option is installed **/
         private final boolean METACAT_SPATIAL = true;
         /**
          * the main routine used to test the DBQuery utility.
          * <p>
-...
+             }
              catch (Exception ee)
+             {
                logMetacat.error("erro to generate QuerySpecification object"
                logMetacat.error("error generating QuerySpecification object"
                                         +" in DBQuery.findDocuments"
                                         + ee.getMessage());
+             }
-...
             resultset = findResultDoclist(qspec, resultset, out, user, groups,
                                           dbconn, useXMLIndex);
           } //try
           catch (IOException ioe)
+          {
-...
                                           DBConnection dbconn, boolean useXMLIndex )
                                           throws Exception
+        {
           MetacatSpatialDataset metacatSpatialData;
           if ( METACAT_SPATIAL )
             metacatSpatialData = new MetacatSpatialDataset();
           int offset = 1;
           // this is a hack for offset
           if (out == null)
-...
           while (tableHasRows)
+          {
             docid = rs.getString(1).trim();
             if ( METACAT_SPATIAL ) {
               System.out.println("###################################################");
               System.out.println("###################################################");
               System.out.println("###################################################");
               System.out.println("###################################################");
               System.out.println("###################################################");
               System.out.println("################ " + docid + " ####################");
               // make sure that the spatial dataset is initialized
               MetacatSpatialQuery spatialQuery = new  MetacatSpatialQuery();
               // create the spatial document
               MetacatSpatialDocument msdoc = spatialQuery.getSpatialDocument(docid);
               // add the spatial document to the spatial dataset
               metacatSpatialData.add(msdoc);
               // write the persistent spatial dataset
               //////metacatSpatialData.write();
               System.out.println("###################################################");
               System.out.println("###################################################");
               System.out.println("###################################################");
               System.out.println("###################################################");
               System.out.println("###################################################");
+            }
             docname = rs.getString(2);
             doctype = rs.getString(3);
             createDate = rs.getString(4);
-...
          logMetacat.warn("prepare docid list time: "
                         + (docListTime - queryExecuteTime));
          //write the persistent spatial dataset
          metacatSpatialData.writeTextQueryData();
          return resultsetBuffer;
         }//findReturnDoclist

src/edu/ucsb/nceas/metacat/DBTransform.java
73	73
74	74	import java.util.Properties;
75	75
	76
76	77	/**
77	78	* A Class that transforms XML documents utitlizing XSL style sheets
78	79	*/

Project

General

Profile

Metacat

Revision 2912

Added by harris almost 19 years ago