/ - Diff - gvSIG tools: Catalog - gvSIG

     package org.gvsig.catalog.catalog.drivers;
     import java.net.URI;
     import org.gvsig.catalog.CatalogLocator;
     import org.gvsig.catalog.CatalogManager;
     import org.gvsig.catalog.drivers.AbstractCatalogServiceDriver;
     import org.gvsig.catalog.drivers.CatalogCapabilities;
     import org.gvsig.catalog.drivers.DiscoveryServiceCapabilities;
     import org.gvsig.catalog.drivers.GetRecordsReply;
     import org.gvsig.catalog.querys.CatalogQuery;
     import org.gvsig.catalog.schemas.Record;
     import org.gvsig.catalog.ui.search.SearchAditionalPropertiesPanel;
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+     *
      * $Id: ExampleNewDriver.java 537 2007-07-26 11:21:10Z jpiera $
      * $Log$
      * Revision 1.1.2.1  2007/07/13 12:00:35  jorpiell
      * Add the posibility to add a new panel
+     *
+     *
      */
     /**
      * @author Jorge Piera LLodr? (jorge.piera@iver.es)
      */
     public class ExampleNewDriver extends AbstractCatalogServiceDriver {
     	private static final CatalogManager catalogManager = CatalogLocator.getCatalogManager();
     	/*
     	 * (non-Javadoc)
     	 * @see es.gva.cit.catalogClient.drivers.IDiscoveryServiceDriver#getCapabilities(java.net.URI)
     	 */
     	public DiscoveryServiceCapabilities getCapabilities(URI uri) {
     		return new CatalogCapabilities();
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see es.gva.cit.catalog.drivers.ICatalogServiceDriver#getRecords(java.net.URI, es.gva.cit.catalog.querys.CatalogQuery, int)
     	 */
     	public GetRecordsReply getRecords(URI uri, CatalogQuery query,
     			int firstRecord) {
     		GetRecordsReply reply = new GetRecordsReply(1);
     		Record record = catalogManager.createRecord(uri, null);
     		record.setTitle("Record example");
     		record.setAbstract_("Just for testing");
     		reply.addRecord(record);
     		return reply;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see es.gva.cit.catalog.drivers.IDiscoveryServiceDriver#getServiceName()
     	 */
     	public String getServiceName() {
     		return "My catalog service";
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see es.gva.cit.gazetteer.drivers.IGazetteerServiceDriver#getAditionalSearchPanel()
     	 */
     	public SearchAditionalPropertiesPanel getAditionalSearchPanel(){
     		return new ExampleNewPanel();
+    	}
+    }

     package org.gvsig.catalog.catalog.drivers;
     import javax.swing.UIManager;
     import javax.swing.UnsupportedLookAndFeelException;
     import org.gvsig.catalog.CatalogLocator;
     import org.gvsig.catalog.ui.serverconnect.ServerConnectDialog;
     import org.gvsig.tools.library.impl.DefaultLibrariesInitializer;
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+     *
      * $Id: ExampleNewDriverTest.java 512 2007-07-24 11:25:43Z jorpiell $
      * $Log$
      * Revision 1.1.2.2  2007/07/24 11:25:42  jorpiell
      * The registers has been refactorized
+     *
      * Revision 1.1.2.1  2007/07/13 12:00:35  jorpiell
      * Add the posibility to add a new panel
+     *
+     *
      */
     /**
      * @author Jorge Piera LLodr? (jorge.piera@iver.es)
      */
     public class ExampleNewDriverTest {
     	/**
     	 * @param args
     	 */
     	public static void main(String[] args) {
     		new DefaultLibrariesInitializer().fullInitialize();
     //		DefaultCatalogLibrary library = new DefaultCatalogLibrary();
     //		library.initialize();
     //		library.postInitialize();
     		CatalogLocator.getCatalogManager().register("My catalog service", ExampleNewDriver.class);
     		//Get the currently installed look and feel
     		UIManager.getLookAndFeel();
     		// Install a different look and feel; specifically, the Windows look and feel
     		try {
     			UIManager.setLookAndFeel(
     					"com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
     		} catch (InstantiationException e) {
     		} catch (ClassNotFoundException e) {
     		} catch (UnsupportedLookAndFeelException e) {
     		} catch (IllegalAccessException e) {
+    		}
     		new ServerConnectDialog();
+    	}
+    }

     package org.gvsig.catalog.catalog.drivers;
     import java.util.Properties;
     import javax.swing.JLabel;
     import javax.swing.JTextField;
     import org.gvsig.catalog.ui.search.SearchAditionalPropertiesPanel;
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+     *
      * $Id: ExampleNewPanel.java 537 2007-07-26 11:21:10Z jpiera $
      * $Log$
      * Revision 1.1.2.1  2007/07/13 12:00:35  jorpiell
      * Add the posibility to add a new panel
+     *
+     *
      */
     /**
      * @author Jorge Piera LLodr? (jorge.piera@iver.es)
      */
     public class ExampleNewPanel extends SearchAditionalPropertiesPanel{
     	JLabel label = null;
     	JTextField text = null;
     	public ExampleNewPanel(){
     		label = new JLabel();
     		text = new JTextField();
     		setLayout(new java.awt.BorderLayout());
     		label.setText("Label");
     		add(label, java.awt.BorderLayout.WEST);
     		add(text, java.awt.BorderLayout.CENTER);
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see es.gva.cit.gazetteer.ui.search.SearchAditionalPropertiesPanel#getProperties()
     	 */
     	public Properties getProperties() {
     		Properties properties = new Properties();
     		properties.put("PROP1", text.getText());
     		return properties;
+    	}
+    }

     package org.gvsig.catalog.catalog.utils;
     import java.net.URI;
     import java.net.URISyntaxException;
     import junit.framework.TestCase;
     import org.gvsig.catalog.utils.URIUtils;
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+     *
      * $Id: URIUtilsTest.java,v 1.1.2.1 2007/07/10 11:18:04 jorpiell Exp $
      * $Log: URIUtilsTest.java,v $
      * Revision 1.1.2.1  2007/07/10 11:18:04  jorpiell
      * Added the registers
+     *
+     *
      */
     /**
      * @author Jorge Piera LLodr? (jorge.piera@iver.es)
      */
     public class URIUtilsTest extends TestCase {
     	public void test1() throws URISyntaxException{
     		URI uri = URIUtils.createUri("http://www.upv.es", "http", 80);
     		assertEquals(uri.getHost(), "www.upv.es");
     		assertEquals(uri.getScheme(), "http");
     		assertEquals(uri.getPort(), 80);
     		assertEquals(uri.getPath(), "");
+    	}
     	public void test2() throws URISyntaxException{
     		URI uri = URIUtils.createUri("www.upv.es", "http", 80);
     		assertEquals(uri.getHost(), "www.upv.es");
     		assertEquals(uri.getScheme(), "http");
     		assertEquals(uri.getPort(), 80);
     		assertEquals(uri.getPath(), "");
+    	}
     	public void test3() throws URISyntaxException{
     		URI uri = URIUtils.createUri("www.upv.es", "z3950", 2100);
     		assertEquals(uri.getHost(), "www.upv.es");
     		assertEquals(uri.getScheme(), "z3950");
     		assertEquals(uri.getPort(), 2100);
     		assertEquals(uri.getPath(), "");
+    	}
     	public void test4() throws URISyntaxException{
     		URI uri = URIUtils.createUri("http://193.144.250.29/webservices/services/IDEC_GeoServeisPort", "http", 80);
     		assertEquals(uri.getHost(), "193.144.250.29");
     		assertEquals(uri.getScheme(), "http");
     		assertEquals(uri.getPort(), 80);
     		assertEquals(uri.getPath(), "/webservices/services/IDEC_GeoServeisPort");
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     package org.gvsig.catalog.loaders;
     public class LayerLoaderException extends Exception {
         private String windowMessage;
         public LayerLoaderException(String message, String windowMessage) {
             super(message);
             this.windowMessage = windowMessage;
+        }
         public LayerLoaderException(String message, Throwable cause, String windowMessage) {
             super(message, cause);
             this.windowMessage = windowMessage;
+        }
         public String getWindowMessage() {
             return windowMessage;
+        }
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     /*
      * AUTHORS (In addition to CIT):
      * 2009 {Iver T.I.}   {Task}
      */
     package org.gvsig.catalog.loaders;
     import org.gvsig.catalog.schemas.Resource;
     /**
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
      */
     public abstract class LayerLoader {
     	private Resource resource = null;
     	public LayerLoader(Resource resource){
     		this.resource = resource;
+    	}
     	abstract public void loadLayer() throws LayerLoaderException;
     	/**
     	 * It returns the error message
     	 * @return
     	 * Error Message
     	 */
     	abstract protected String getErrorMessage();
     	/**
     	 * It returns the window title for an window error message
     	 * @return
     	 * Window title
     	 */
     	abstract protected String getWindowMessage();
     	public Resource getResource() {
     		return resource;
+    	}
     	public void setResource(Resource resource) {
     		this.resource = resource;
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     package org.gvsig.catalog;
     import org.gvsig.catalog.drivers.AbstractCatalogServiceDriver;
     import org.gvsig.catalog.drivers.GetRecordsReply;
     import org.gvsig.catalog.drivers.ICatalogServiceDriver;
     import org.gvsig.catalog.querys.CatalogQuery;
     import org.gvsig.utils.swing.jcomboServer.ServerData;
     /**
      * This class represents a catalogClient. It must be created to
      * use the catalog service
      * @author Jorge Piera Llodra (piera_jor@gva.es)
      */
     public class CatalogClient extends DiscoveryServiceClient{
     	/**
     	 * Constructor
     	 * @param sUri
     	 * The URI typed by the user
     	 * @param database
     	 * The selected database
     	 * @param driver
     	 * The selected catalog driver
     	 */
     	public CatalogClient(String sUri, String database, ICatalogServiceDriver driver) {
     		super(sUri,driver);
+    	}
     	/**
     	 * @return Node array with the retrieved records
     	 * @param query It contains the values to do the query (title="XXX",abstract="YYY",...)
     	 * @param firstRecord Number of the first record to retrieve
     	 */
     	public GetRecordsReply getRecords(CatalogQuery query, int firstRecord) {
     		return ((ICatalogServiceDriver)getDriver()).getRecords(getUri(),query,firstRecord);
+    	}
     	/**
     	 * This method is used to create a new Query
     	 * @return
     	 */
     	public CatalogQuery createNewQuery() {
     		return new CatalogQuery();
+    	}
     	/**
     	 * @return the serverData
     	 */
     	public ServerData getServerData() {
     		return ((AbstractCatalogServiceDriver)getDriver()).getServerData();
+    	}
     	/**
     	 * @param serverData the serverData to set
     	 */
     	public void setServerData(ServerData serverData) {
     		((AbstractCatalogServiceDriver)getDriver()).setServerData(serverData);
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+    *
     * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+    *
     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version 2
     * of the License, or (at your option) any later version.
+    *
     * This program is distributed in the hope that it will be useful,
     * but WITHOUT ANY WARRANTY; without even the implied warranty of
     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     * GNU General Public License for more details.
+    *
     * You should have received a copy of the GNU General Public License
     * along with this program; if not, write to the Free Software
     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+    *
     * For more information, contact:
+    *
     *  Generalitat Valenciana
     *   Conselleria d'Infraestructures i Transport
     *   Av. Blasco Ib??ez, 50
     *   46010 VALENCIA
     *   SPAIN
+    *
     *      +34 963862235
     *   gvsig@gva.es
     *      www.gvsig.gva.es
+    *
     *    or
+    *
     *   IVER T.I. S.A
     *   Salamanca 50
     *   46005 Valencia
     *   Spain
+    *
     *   +34 963163400
     *   dac@iver.es
     */
     package org.gvsig.catalog.z3950.filters;
     import org.gvsig.catalog.filters.AbstractFilter;
     import org.gvsig.catalog.languages.BasicEncodingRules;
     import org.gvsig.i18n.Messages;
     /**
+     *
+     *
+     *
      * @author Jorge Piera Llodra (piera_jor@gva.es)
      */
     public class Z3950Filter extends AbstractFilter {
     	private String database = null;
         public  Z3950Filter(String database) {
             super();
             this.database = database;
+        }
         /*
          * (non-Javadoc)
          * @see es.gva.cit.catalog.filters.IFilter#getQuery(es.gva.cit.catalog.querys.CatalogQuery)
          */
         public String getQuery(org.gvsig.catalog.querys.CatalogQuery query) {
             // Create a RemoteBooleanQuery
             BasicEncodingRules filter = new BasicEncodingRules();
             //Title (title, 4), Word List (6)
             if (query.getTitle() != null) {
                 filter.addClauses("4", "6", "3", query.getTitle(),
                         query.getTitleFilter(),"and");
+            }
             if (query.isMinimized()){
                 if (query.getAbstract() != null) {
                     filter.addClauses("62", "6", "3", query.getAbstract(), "E", "or");
+                }
             }else{
                 if (query.getAbstract() != null) {
                     filter.addClauses("62", "6", "3", query.getAbstract(), "E", "and");
+                }
                     //  Theme Keyword (themekey, 2002), Word List (6)
                 if (query.getThemeKey() != null) {
                     filter.addClauses("2002", "6", "3", query.getThemeKey(), "Y","and");
+                }
                 //  Source Scale Denominator (srcscale, 1024), Numeric String (109)
                 if (query.getScale() != null) {
                     if (query.getMinScale() != null){
                         filter.addClauses("1024", "109", "4", query.getMinScale(),"E","and");
+                    }
                     if (query.getMaxScale() != null){
                         filter.addClauses("1024", "109", "2", query.getMaxScale(),"E","and");
+                    }
+                }
                 if (query.getProvider() != null) {
                     filter.addClauses("1005", "6", "3", query.getProvider(), "E","and");
+                }
             //     Beginning Date  (begdate, 1012), Date(210)
                 if (query.getDateFrom() != null) {
                     filter.addClauses("1012", "210", "18", query.getDateFrom(), "E","and");
+                }
                 //  Ending Date (date, 1012 ), Date(210)
                 if (query.getDateTo() != null) {
                     filter.addClauses("1012", "210", "14", query.getDateTo(), "E","and");
+                }
+            }
             if ((query.getCoordenates() != null) && (query.isCoordinatesClicked())){
                     String sNorth = query.getCoordenates().getUly();
                     String sWest = query.getCoordenates().getUlx();
                     String sSouth = query.getCoordenates().getBry();
                     String sEast = query.getCoordenates().getBrx();
                     String sBounding = sNorth + " " + sWest + " " + sSouth + " " +
                         sEast;
                     String sRelation = getRelation(query.getCoordenatesFilter());
                 //  Bounding Coordinates (bounding, 2060), Coordinate String (201)
                 filter.addClauses("2060", "201", sRelation, sBounding, "E","and");
+            }
             //return query
             return filter.toString(database);
+        }
     /**
      * Return a value for the option of the 'Coordenates Filter'
+     *
      * @param relation String in the combo. Possible values:
      * encloses
      * overlaps
      * fullyOutsideOf
      * equals
+     *
      * @return String
      * Possible values:
      * 9 -> encloses
      * 7 -> overlaps
      * 10 -> fullyOutsideOf
      * 3 -> equals
      * @param translator
      * @param relacion
      */
         private String getRelation(String relacion) {
             if (relacion.equals(Messages.getText("coordinatesEqual"))) {
                 return "3";
+            }
             if (relacion.equals(Messages.getText("coordinatesContains"))) {
                 return "7";
+            }
             if (relacion.equals(Messages.getText("coordinatesEnclose"))) {
                 return "9";
             } else {
                 return "10";
+            }
+        }
+     }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     package org.gvsig.catalog.z3950.drivers;
     import java.io.ByteArrayInputStream;
     import java.net.URI;
     import java.util.ArrayList;
     import java.util.Collection;
     import org.gvsig.catalog.drivers.AbstractCatalogServiceDriver;
     import org.gvsig.catalog.drivers.CatalogCapabilities;
     import org.gvsig.catalog.drivers.DiscoveryServiceCapabilities;
     import org.gvsig.catalog.drivers.GetRecordsReply;
     import org.gvsig.catalog.metadataxml.XMLNode;
     import org.gvsig.catalog.metadataxml.XMLTree;
     import org.gvsig.catalog.protocols.Z3950Protocol;
     import org.gvsig.catalog.querys.CatalogQuery;
     import org.gvsig.utils.swing.jcomboServer.ServerData;
     /**
      * This class implements the Z39.50 protocol.
+     *
+     *
      * @author Jorge Piera Llodra (piera_jor@gva.es)
      * @see http://www.loc.gov/z3950/agency/
      */
     public class Z3950CatalogServiceDriver extends AbstractCatalogServiceDriver {
     	/*
     	 * (non-Javadoc)
     	 * @see es.gva.cit.catalogClient.drivers.IDiscoveryServiceDriver#getCapabilities(java.net.URI)
     	 */
     	public DiscoveryServiceCapabilities getCapabilities(URI uri) {
     		Collection nodes = new ArrayList();;
     		Z3950Messages messages = new Z3950Messages(this);
     		String message = messages.getCapabilities(new Z3950Protocol().openConnection(
     				uri));
     		ByteArrayInputStream buffer = new ByteArrayInputStream(message.getBytes());
     		nodes.add(XMLTree.xmlToTree(buffer));
     		setServerAnswerReady(XMLTree.searchNodeValue((XMLNode)nodes.toArray()[0], "Servidor"));
     		CatalogCapabilities capabilities = new CatalogCapabilities();
     		capabilities.setVersion("3.0");
     		return capabilities;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see es.gva.cit.catalogClient.drivers.ICatalogServiceDriver#getRecords(java.net.URI, es.gva.cit.catalogClient.querys.Query, int)
     	 */
     	public GetRecordsReply getRecords(URI uri, CatalogQuery query, int firstRecord) {
     		setQuery(query);
     		Z3950Messages messages = new Z3950Messages(this);
     		String message = messages.getRecords(getQuery(),Z3950Protocol.getDatabase(uri));
     		System.out.println(message);
     		new Z3950Protocol().doQuery(getRecordsReply(), uri, message, firstRecord);
     		return getRecordsReply();
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see es.gva.cit.catalogClient.drivers.ICatalogServiceDriver#isProtocolSupported(java.net.URI)
     	 */
     	public boolean isProtocolSupported(URI uri) {
     		return new Z3950Protocol().isProtocolSupported(uri);
+    	}
     	/**
     	 * @return
     	 */
     	public String getQueryProfile() {
     		return "Z3950";
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see es.gva.cit.catalogClient.drivers.ICatalogServiceDriver#getServiceName()
     	 */
     	public String getServiceName() {
     		return ServerData.SERVER_SUBTYPE_CATALOG_Z3950;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see es.gva.cit.catalogClient.drivers.ICatalogServiceDriver#getDefaultPort()
     	 */
     	public int getDefaultPort() {
     		return 2100;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see es.gva.cit.catalogClient.drivers.ICatalogServiceDriver#getDefaultSchema()
     	 */
     	public String getDefaultSchema() {
     		return "z3950";
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+    *
     * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+    *
     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version 2
     * of the License, or (at your option) any later version.
+    *
     * This program is distributed in the hope that it will be useful,
     * but WITHOUT ANY WARRANTY; without even the implied warranty of
     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     * GNU General Public License for more details.
+    *
     * You should have received a copy of the GNU General Public License
     * along with this program; if not, write to the Free Software
     * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+    *
     * For more information, contact:
+    *
     *  Generalitat Valenciana
     *   Conselleria d'Infraestructures i Transport
     *   Av. Blasco Ib??ez, 50
     *   46010 VALENCIA
     *   SPAIN
+    *
     *      +34 963862235
     *   gvsig@gva.es
     *      www.gvsig.gva.es
+    *
     *    or
+    *
     *   IVER T.I. S.A
     *   Salamanca 50
     *   46005 Valencia
     *   Spain
+    *
     *   +34 963163400
     *   dac@iver.es
     */
     /*
     * CVS MESSAGES:
+    *
     * $Id: Z3950Messages.java 585 2007-09-03 10:21:55 +0000 (Mon, 03 Sep 2007) jpiera $
     * $Log$
     * Revision 1.4.10.2  2006/11/15 00:08:08  jjdelcerro
     * *** empty log message ***
+    *
     * Revision 1.6  2006/10/02 08:29:07  jorpiell
     * Modificados los cambios del Branch 10 al head
+    *
     * Revision 1.4.10.1  2006/09/20 12:01:18  jorpiell
     * Se ha cambiado la versi?n de la jzkit, se ha incorporado la funcionalidad de cargar arcims
+    *
     * Revision 1.5  2006/09/20 11:22:43  jorpiell
     * Se ha cambiado la versi?n de la librer?a jzkit de la 1 a la 2.0
+    *
     * Revision 1.4  2006/01/12 13:52:24  jorpiell
     * Se ha a?adido un boton close en las dos pantallas de connect. Adem?s se ha cambiado el comportamiento de las ventanas para adaptarlo a la nueva forma de buscar multihilo
+    *
     * Revision 1.3  2006/01/10 17:23:23  jorpiell
     * Se ha hecho una peque?a modificaci?n en el gazeteer: ahora funcionan las b?squedas restringiendo el ?rea en el WFSG. Hay muchos cambios porque se ha hecho un CONTROL+SHIFT+O sobre todo el proyecto para eliminar los imports y para ordenarlos
+    *
     * Revision 1.2  2006/01/10 09:32:49  jorpiell
     * Se ha echo un commit de las versiones modificadas del catalogo y del gazetteer usando el Poseidon. Se han renombrado algunas clases por considerar que tenian un nombre confuso y se han cambiado algunas relaciones entre clases (con la intenci?n de separar GUI de la parte de control). Han habido clases que no han sido tocadas, pero como han sido formateadas usando el Poseidon TODAS las CLASES del proyecto han cambiado de versi?n.
+    *
     * Revision 1.1  2005/12/22 08:31:43  jorpiell
     * Aqui tambien se han producido muchos cambis, porque hemos acabado de cambiar la estructura del cat?logo: Se han creado todas las clases "XXXMessages", que sacan toda la parte de los mensajes de los drivers. Ademas se ha incluido en "CatalogClient" la operaci?n "getCapabilities", que libera a la interfaz de algunas operaciones que hac?a anteriormente.
+    *
+    *
     */
     package org.gvsig.catalog.z3950.drivers;
     import org.gvsig.catalog.querys.CatalogQuery;
     import org.gvsig.catalog.z3950.filters.Z3950Filter;
     /**
      * This class is used to create all the Z3950 protocol
      * messages
+     *
+     *
      * @author Jorge Piera Llodra (piera_jor@gva.es)
      */
     public class Z3950Messages {
     /**
+     *
+     *
      */
         private Z3950CatalogServiceDriver driver = null;
     /**
+     *
+     *
+     *
      * @param driver
      */
         public  Z3950Messages(Z3950CatalogServiceDriver driver) {
             this.driver = driver;
+        }
     /**
+     *
+     *
+     *
      * @return
      * @param message
      */
         public String getCapabilities(String message) {
             return "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>" + "<Z3950> " +
             "<Servidor>" + message + "</Servidor>" + "</Z3950>";
+        }
     /**
+     *
+     *
+     *
      * @return
      * @param query
      */
         public String getRecords(CatalogQuery query,String database) {
             return new Z3950Filter(database).getQuery(query);
+        }
+     }

     package org.gvsig.catalog.csw.messages;
     import java.util.HashMap;
     import org.gvsig.catalog.csw.drivers.profiles.CSWAbstractProfile;
     import org.gvsig.catalog.csw.parsers.CSWConstants;
     import org.gvsig.catalog.exceptions.NotSupportedVersionException;
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+     *
      * $Id$
      * $Log$
+     *
      */
     /**
      * @author Jorge Piera LLodr? (jorge.piera@iver.es)
      */
     public class CSWMessagesFactory {
     	private static HashMap messages = null;
     	static{
     		messages = new HashMap();
     		messages.put(CSWConstants.VERSION_0_9_0, CSWMessages0_9_0.class);
     		messages.put(CSWConstants.VERSION_2_0_0, CSWMessages2_0_0.class);
     		messages.put(CSWConstants.VERSION_2_0_1, CSWMessages2_0_1.class);
     		messages.put(CSWConstants.VERSION_2_0_2, CSWMessages2_0_2.class);
+    	}
     	/**
     	 * Gets a messages class
     	 * @param version
     	 * The CSW version
     	 * @param profile
     	 * The CSW profile
     	 * @return
     	 * A CSWAbstractMessages class
     	 * @throws NotSupportedVersionException
     	 */
     	public static CSWAbstractMessages getMessages(String version, CSWAbstractProfile profile) throws NotSupportedVersionException{
     		if ((version != null) && (messages.containsKey(version))){
     			Class clazz = (Class)messages.get(version);
     			Class[] parameters = {CSWAbstractProfile.class};
     			Object[] args = {profile};
     			try {
     				return (CSWAbstractMessages)clazz.getConstructor(parameters).newInstance(args);
     			} catch (Exception e) {
     				throw new NotSupportedVersionException(e);
+    			}
+    		}
     		throw new NotSupportedVersionException();
+    	}
+    }

     package org.gvsig.catalog.csw.messages;
     import org.gvsig.catalog.csw.drivers.profiles.CSWAbstractProfile;
     import org.gvsig.catalog.csw.parsers.CSWConstants;
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+     *
      * $Id$
      * $Log$
+     *
      */
     /**
      * @author Jorge Piera LLodr? (jorge.piera@iver.es)
      */
     public class CSWMessages2_0_0 extends CSWAbstractMessages {
     	public CSWMessages2_0_0(CSWAbstractProfile profile) {
     		super(profile);
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see es.gva.cit.catalog.csw.messages.CSWAbstractMessages#getContraintVersion()
     	 */
     	protected String getContraintVersion() {
     		return CSWConstants.CONSTRAINT_VERSION_2_0_0;
+    	}
+    }

     package org.gvsig.catalog.csw.messages;
     import org.gvsig.catalog.csw.drivers.profiles.CSWAbstractProfile;
     import org.gvsig.catalog.csw.parsers.CSWConstants;
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+     *
      * $Id$
      * $Log$
+     *
      */
     /**
      * @author Jorge Piera LLodr? (jorge.piera@iver.es)
      */
     public class CSWMessages2_0_1 extends CSWAbstractMessages{
     	public CSWMessages2_0_1(CSWAbstractProfile profile) {
     		super(profile);
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see es.gva.cit.catalog.csw.messages.CSWAbstractMessages#getContraintVersion()
     	 */
     	protected String getContraintVersion() {
     		return CSWConstants.CONSTRAINT_VERSION_2_0_1;
+    	}
+    }

     package org.gvsig.catalog.csw.messages;
     import org.gvsig.catalog.csw.drivers.profiles.CSWAbstractProfile;
     import org.gvsig.catalog.csw.parsers.CSWConstants;
     import org.gvsig.catalog.languages.FilterEncoding;
     import org.gvsig.catalog.utils.CatalogConstants;
     import org.gvsig.catalog.utils.Strings;
     import org.gvsig.i18n.Messages;
     import org.gvsig.utils.swing.jcomboServer.ServerData;
     /**
      * @author jvhigon
      */
     public class CSWMessages2_0_2 extends CSWAbstractMessages{
     	//private CSWCapabilities capabilities = null;
     	//private static final String TYPENAMES = "Dataset";
     	public CSWMessages2_0_2(CSWAbstractProfile profile) {
     		super(profile);
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see es.gva.cit.catalog.csw.messages.CSWAbstractMessages#getContraintVersion()
     	 */
     	protected String getContraintVersion() {
     		return CSWConstants.CONSTRAINT_VERSION_2_0_2;
+    	}
     	/**
     	 * Create the GetRecords header.
     	 * @param firstRecord
     	 * @return
     	 */
     	protected String createGetRecordsHeader(int firstRecord){
     		StringBuffer buffer = new StringBuffer();
     		buffer.append(CatalogConstants.XML_HEADER_ENCODING);
     		buffer.append("<" + CSWConstants.CSW_NAMESPACE +
     				":" + CSWConstants.CSW_GET_RECORDS);
     		buffer.append(" " + CSWConstants.CSW_SERVICE + "=\"" + ServerData.SERVER_SUBTYPE_CATALOG_CSW + "\" ");
     		buffer.append(CSWConstants.CSW_VERSION + "=\"" + capabilities.getVersion() + "\" ");
     		buffer.append(CatalogConstants.XML_NS + "=\"" +CSWConstants.CSW_NAMESPACE_URI + "/2.0.2"+ "\" ");
     		buffer.append(CatalogConstants.XML_NS + ":" + CSWConstants.CSW_NAMESPACE +
     				"=\"" + CSWConstants.CSW_NAMESPACE_URI + "/2.0.2"+ "\" ");
     		buffer.append(CatalogConstants.XML_NS + ":" + CSWConstants.OGC_NAMESPACE +
     				"=\"" + CSWConstants.OGC_NAMESPACE_URI + "\" ");
     		buffer.append(CatalogConstants.XML_NS + ":" + CSWConstants.GML_NAMESPACE +
     				"=\"" + CSWConstants.GML_NAMESPACE_URI + "\" ");
     		buffer.append(CSWConstants.CSW_START_POSITION + "='" +	firstRecord  + "' ");
     		buffer.append(CSWConstants.CSW_MAX_RECORDS + "='10' ");
     		if ( capabilities.getOutputFormat() != null){
     			buffer.append(CSWConstants.CSW_OUTPUTFORMAT + "=\"" + capabilities.getOutputFormat() + "\" ");
+    		}
     		if (getOutputSchema(capabilities.getOutputSchema()) != null){
     			buffer.append(CSWConstants.CSW_OUTPUTSCHEMA + "=\"" + getOutputSchema(capabilities.getOutputSchema()) + "\" ");
     		}else{
     			buffer.append(CSWConstants.CSW_OUTPUTSCHEMA + "=\"csw:IsoRecord\" ");
+    		}
     		buffer.append("resultType=\"" +
     				getResultType(capabilities.getResultType()) + "\">");
     		buffer.append(createGetRecordsQuery());
     		buffer.append("</" + CSWConstants.CSW_NAMESPACE + ":" + CSWConstants.OPERATION_GETRECORDS + ">");
     		return buffer.toString();
+    	}
     	/**
     	 * @return the Query xml sub tree of the GetRecords
     	 * operation
     	 */
     	protected String createGetRecordsQuery(){
     		StringBuffer buffer = new StringBuffer();
     		buffer.append("<" + CSWConstants.CSW_NAMESPACE + ":" + CSWConstants.QUERY + " ");
     		if (capabilities.getTypeNames() != null && capabilities.getTypeNames().length > 0){
     			String[] auxTypeNames = new String[capabilities.getTypeNames().length - 1];
     			for (int i=1; i<capabilities.getTypeNames().length; i++){
     				auxTypeNames[i-1] = capabilities.getTypeNames()[i];
+    			}
     			buffer.append(CSWConstants.TYPENAMES + "=\"" +
     					Strings.getBlankSeparated(auxTypeNames) + "\"");
+    		}
     		buffer.append(">");
     		buffer.append(getElementSetNameLabel(query.getService()));
     		buffer.append(createGetRecordsConstraint());
     		buffer.append("</" + CSWConstants.CSW_NAMESPACE + ":" + CSWConstants.QUERY + ">");
     		return buffer.toString();
+    	}
     	/**
     	 * Creates the filter encoding query
     	 * @param query
     	 * @return
     	 */

Application: gvSIG desktop » gvSIG tools: Catalog

Revision 1166