/ - Diff - Metacat - Ecoinformatics Redmine

+      }
       /**
        * returns the document corresponding to the input index from this dataset
        */
       public MetacatSpatialDocument getDocument(int _id) {
         return (MetacatSpatialDocument)docs.elementAt(_id);
+      }
-...
         StringBuffer _sb = new StringBuffer();
         for (int i = 0; i < docs.size(); i++) {
           MetacatSpatialDocument _doc = (MetacatSpatialDocument)docs.elementAt(i);
           try {
           if ( ! _doc.getIsPoint() ) {
             _sb.append( _doc.getXMin()+ " " + _doc.getYMin() + " 0 " + _doc.getDocid()+"\n");
             _sb.append( _doc.getXMax()+ " " + _doc.getYMin() + " 0 " + _doc.getDocid()+"\n");
             _sb.append( _doc.getXMax()+ " " + _doc.getYMax() + " 0 " + _doc.getDocid()+"\n");
             _sb.append( _doc.getXMin()+ " " + _doc.getYMax() + " 0 " + _doc.getDocid()+"\n");
+          }
           } catch (NullPointerException npe) {
             log.fatal("ERROR: null pointer exception on a spatial document");
             npe.getMessage();
+          }
+        }
         return _sb;
+      }
       /**
        * writes the entire metacat spatial dataset
        */
        public void writeMetacatSpatialCache() {
         // write the data stored in this object using the persistent layer
         PersistentMetacatSpatialDataset _writer = new PersistentMetacatSpatialDataset();
          _writer.writeMetacatSpatialCache(this);
+       }
       /*
        * Writes the dataset to the file system
        */
       public void writeTextQueryData() {
       public void writeTextQueryData() {
         // write the data stored in this object using the persistent layer
         PersistentMetacatSpatialDataset _writer = new PersistentMetacatSpatialDataset();
          _writer.writeTextQueryData(this);
+      }

     public class PersistentMetacatSpatialDataset {
       private String textQueryAsciiFile = "/tmp/mso_metacat_textquery.ascii";
       private String metacatSpatialCacheAsciiFile = "/tmp/mso_metacat_cache.ascii";
       private static Logger log = Logger.getLogger(PersistentMetacatSpatialDataset.class.getName());
       /*
        * Writes the dataset to the file system
        */
       public void writeMetacatSpatialCache(MetacatSpatialDataset dataset) {
       try {
         PrintStream out = new PrintStream(new FileOutputStream( metacatSpatialCacheAsciiFile));
         out.println("#HEADER x y z segid");
         out.println( dataset.getExtentsDataAsAscii());
         log.fatal("extents data: " + dataset.getExtentsDataAsAscii() +" done" );
         out.close();
       } catch (FileNotFoundException fnfe) {
         log.fatal("ERROR: could not find the file ");
         fnfe.printStackTrace();
+      }
+      }
       /*
        * Writes the dataset to the file system
        */

         FileReader queryFileReader = new FileReader(QUERYFILE);
         String res = runQuery((Reader) queryFileReader);
          return res;
       } protected MetacatSpatialDataset queryDatasetByCartesianBounds(float
+      }
       /**
        * returns the dataset constained by the input cartesian boundaries
+       *
        * param _xmin -- the minimum x cartesian boundary
        * param _ymin -- the minimum y cartesian boundary
        * param _xmax -- the maximum x cartesian boundary
        * param _ymax -- the maximum y cartesian boundary
+       *
        * returns data -- a Metacat spatial dataset, containing all the documents
        * within the input bounding box
        */
       protected MetacatSpatialDataset queryDatasetByCartesianBounds(float
                                                                       _xmin,
                                                                       float
                                                                       _ymin,
-...
         // for each, see if they fall w/in bounds
         for (int i = 0; i < _docs.size(); i++) {
         MetacatSpatialExtents _extents = new MetacatSpatialExtents();
           float _docMaxY =
               queryNorthBoundingCoordinate((String) _docs.elementAt(i));
           float _docMinY =
-...
               queryWestBoundingCoordinate((String) _docs.elementAt(i));
           // check if inside the bounding box
           if (_docMaxX <= _xmax && _docMaxX >= _xmin) {
           if (_docMaxX <= _xmax && _docMinX >= _xmin && _docMaxY <= _ymax && _docMinY >= _ymin ) {
             MetacatSpatialDocument _doc =
                 new MetacatSpatialDocument((String) _docs.elementAt(i));
             log.warn("----------------------------------------------------------");
             log.warn("----------------------------------------------------------");
             log.warn("----------------------------------------------------------");
             log.warn("----------------------------------------------------------");
             log.warn(_docMinX+ " "+  _docMinY + " " +_docMaxX+ " " + _docMaxY);
             _doc.setDocid((String) _docs.elementAt(i));
             _extents.setXMin(_docMinX);
             _extents.setYMin(_docMinY);
             _extents.setXMax(_docMaxX);
             _extents.setYMax(_docMaxY);
             if ( _xmax==_xmin &&  _ymax==_ymin ) {
               _extents.setIsPoint(true);
             } else {
               _extents.setIsPoint(false);
+            }
             // set the extents
             _doc.setExtents(_extents);
             _data.add(_doc);
+          }
+        }
         return _data;
+      }
       /**
        * Returns a Vector of all the docids in the xml_nodes tables
        */

src/edu/ucsb/nceas/metacat/spatial/QueryFailedException.java
39	39	* @param message The error or warning message.
40	40	*/
41	41	public QueryFailedException(String message) {
42		super(message);
	42	super(message);
43	43	}
44	44	}

+      }
       public float getXMin() { return extents.getXMin(); }
       public void setXMin(float x) { extents.setXMin(x); }
       public float getYMin() { return extents.getYMin(); }
       public void setYMin(float y) {extents.setYMin(y); }
       public float getXMax() { return extents.getXMax(); }
       public void setXMax(float x) {extents.setXMax(x); }
       public float getYMax() { return extents.getYMax(); }
       public void setYMax(float y) {extents.setYMax(y); }
       public String getDocid() { return this.docid; }
       public boolean getIsPoint() { return extents.getIsPoint(); }
       public void setIsPoint(boolean ispoint) { extents.setIsPoint(ispoint); }
+    }

+                    }
                     MetaCatUtil.skinconfigs.put(skinName, skinOption);
+                }
                 // create a spatial index of the database
                 MetacatSpatialQuery  _spatialQuery = new MetacatSpatialQuery();
                 // issue the query  -- using the geographic bounds of the Earth
                 MetacatSpatialDataset _data = _spatialQuery.queryDatasetByCartesianBounds(-180, -90, 180, 90);
                 // write the data to the appropriate theme
                 _data.writeMetacatSpatialCache();
                 MetaCatUtil.printMessage("Metacat (" + Version.getVersion()
                                    + ") initialized.");

Project

General

Profile

Metacat

Revision 2913

Added by harris almost 19 years ago