Menu
▾
▴
[GeoNetwork-commit] SF.net SVN: geonetwork:[1932] sandbox/geocat.ch/trunk
|
From: <jes...@us...> - 2009-01-12 09:33:38
|
Revision: 1932
http://geonetwork.svn.sourceforge.net/geonetwork/?rev=1932&view=rev
Author: jesseeichar
Date: 2009-01-12 09:33:27 +0000 (Mon, 12 Jan 2009)
Log Message:
-----------
added messed up revision 1919
Revision Links:
--------------
http://geonetwork.svn.sourceforge.net/geonetwork/?rev=1919&view=rev
Modified Paths:
--------------
sandbox/geocat.ch/trunk/src/org/fao/geonet/constants/Edit.java
sandbox/geocat.ch/trunk/src/org/fao/geonet/kernel/DataManager.java
sandbox/geocat.ch/trunk/src/org/fao/geonet/kernel/csw/services/getrecords/CatalogSearcher.java
sandbox/geocat.ch/trunk/src/org/fao/geonet/kernel/search/LuceneSearcher.java
sandbox/geocat.ch/trunk/web/geonetwork/WEB-INF/summaryConfig.xml
sandbox/geocat.ch/trunk/web/geonetwork/loc/deu/xml/strings.xml
sandbox/geocat.ch/trunk/web/geonetwork/loc/fra/xml/strings.xml
sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19115/index-fields.xsl
sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19139/index-fields.xsl
sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19139/language-index-fields.xsl
sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19139.che/index-fields.xsl
sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19139.che/language-index-fields.xsl
sandbox/geocat.ch/trunk/web/geonetwork/xsl/banner.xsl
Modified: sandbox/geocat.ch/trunk/src/org/fao/geonet/constants/Edit.java
===================================================================
--- sandbox/geocat.ch/trunk/src/org/fao/geonet/constants/Edit.java 2009-01-12 07:44:08 UTC (rev 1931)
+++ sandbox/geocat.ch/trunk/src/org/fao/geonet/constants/Edit.java 2009-01-12 09:33:27 UTC (rev 1932)
@@ -91,7 +91,8 @@
public static final String DOWNLOAD = "download";
public static final String DYNAMIC = "dynamic";
public static final String FEATURED = "featured";
- public static final String VIEW = "view";
+ public static final String VIEW = "view";
+ public static final String GROUPOWNER = "groupowner";
}
}
Modified: sandbox/geocat.ch/trunk/src/org/fao/geonet/kernel/DataManager.java
===================================================================
--- sandbox/geocat.ch/trunk/src/org/fao/geonet/kernel/DataManager.java 2009-01-12 07:44:08 UTC (rev 1931)
+++ sandbox/geocat.ch/trunk/src/org/fao/geonet/kernel/DataManager.java 2009-01-12 09:33:27 UTC (rev 1932)
@@ -1884,7 +1884,7 @@
Dbms dbms = (Dbms) context.getResourceManager().open(Geonet.Res.MAIN_DB);
String query ="SELECT schemaId, createDate, changeDate, source, isTemplate, title, "+
- "uuid, isHarvested, harvestUuid, popularity, rating FROM Metadata WHERE id = " + id;
+ "uuid, isHarvested, harvestUuid, popularity, rating, groupowner FROM Metadata WHERE id = " + id;
// add Metadata table infos: schemaId, createDate, changeDate, source,
Element rec = dbms.select(query).getChild("record");
@@ -1899,7 +1899,8 @@
String isHarvested= rec.getChildText("isharvested");
String harvestUuid= rec.getChildText("harvestuuid");
String popularity = rec.getChildText("popularity");
- String rating = rec.getChildText("rating");
+ String rating = rec.getChildText("rating");
+ String groupowner = rec.getChildText("groupowner");
Element info = new Element(Edit.RootChild.INFO, Edit.NAMESPACE);
@@ -1913,7 +1914,8 @@
addElement(info, Edit.Info.Elem.UUID, uuid);
addElement(info, Edit.Info.Elem.IS_HARVESTED,isHarvested);
addElement(info, Edit.Info.Elem.POPULARITY, popularity);
- addElement(info, Edit.Info.Elem.RATING, rating);
+ addElement(info, Edit.Info.Elem.RATING, rating);
+ addElement(info, Edit.Info.Elem.GROUPOWNER, groupowner);
if (isHarvested.equals("y"))
info.addContent(harvestMan.getHarvestInfo(harvestUuid, id, uuid));
Modified: sandbox/geocat.ch/trunk/src/org/fao/geonet/kernel/csw/services/getrecords/CatalogSearcher.java
===================================================================
--- sandbox/geocat.ch/trunk/src/org/fao/geonet/kernel/csw/services/getrecords/CatalogSearcher.java 2009-01-12 07:44:08 UTC (rev 1931)
+++ sandbox/geocat.ch/trunk/src/org/fao/geonet/kernel/csw/services/getrecords/CatalogSearcher.java 2009-01-12 09:33:27 UTC (rev 1932)
@@ -215,7 +215,7 @@
{
if (elem.getName().equals("TermQuery")) {
String field = elem.getAttributeValue("fld");
- if (!field.equals("keyword")) { // Quick fix for keyword but should be for all non tokenized field
+ if (!field.equals("keyword") && !field.equals("_orgName")) { // Quick fix for keyword but should be for all non tokenized field
String text = elem.getAttributeValue("txt");
if (text.indexOf(" ") != -1) {
Modified: sandbox/geocat.ch/trunk/src/org/fao/geonet/kernel/search/LuceneSearcher.java
===================================================================
--- sandbox/geocat.ch/trunk/src/org/fao/geonet/kernel/search/LuceneSearcher.java 2009-01-12 07:44:08 UTC (rev 1931)
+++ sandbox/geocat.ch/trunk/src/org/fao/geonet/kernel/search/LuceneSearcher.java 2009-01-12 09:33:27 UTC (rev 1932)
@@ -618,7 +618,7 @@
*/
private static final String processToken(String string, String field)
{
- if (field.equals("keyword")) // Quick fix for keyword but should be for all non tokenized field
+ if (field.equals("keyword") || field.equals("_orgName")) // Quick fix for keyword but should be for all non tokenized field
return string;
else
return removeAccents(string).toLowerCase();
Modified: sandbox/geocat.ch/trunk/web/geonetwork/WEB-INF/summaryConfig.xml
===================================================================
--- sandbox/geocat.ch/trunk/web/geonetwork/WEB-INF/summaryConfig.xml 2009-01-12 07:44:08 UTC (rev 1931)
+++ sandbox/geocat.ch/trunk/web/geonetwork/WEB-INF/summaryConfig.xml 2009-01-12 09:33:27 UTC (rev 1932)
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<summary>
+<!-- All items specified in a summarz MUST have a non tokeniyed field in the
+ lucene index. Indeed the search is made on the exact value from the client side.
+ Once added to summary config. you have to edit he JS refine search title -->
<def>
<hits />
<results>
@@ -19,7 +22,7 @@
<item name="spatialRepresentation" plural="spatialRepresentations"
indexKey="spatialRepresentation" type="string" order="freq" max="10" />
<item name="organizationName" plural="organizationNames"
- indexKey="orgName" order="freq" type="string" max="10" />
+ indexKey="_orgName" order="freq" type="string" max="10" />
<item name="group" plural="groups"
indexKey="_groupOwnerName" order="freq" type="string" max="10" />
<item name="serviceType" plural="serviceTypes" indexKey="serviceType"
Modified: sandbox/geocat.ch/trunk/web/geonetwork/loc/deu/xml/strings.xml
===================================================================
--- sandbox/geocat.ch/trunk/web/geonetwork/loc/deu/xml/strings.xml 2009-01-12 07:44:08 UTC (rev 1931)
+++ sandbox/geocat.ch/trunk/web/geonetwork/loc/deu/xml/strings.xml 2009-01-12 09:33:27 UTC (rev 1932)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<strings>
+ <refineSearch.title>TODO</refineSearch.title>
<parent>View parent metadata</parent>
<userdetails>User details</userdetails>
<publicaccess>Allow user to be used in metadata records</publicaccess>
Modified: sandbox/geocat.ch/trunk/web/geonetwork/loc/fra/xml/strings.xml
===================================================================
--- sandbox/geocat.ch/trunk/web/geonetwork/loc/fra/xml/strings.xml 2009-01-12 07:44:08 UTC (rev 1931)
+++ sandbox/geocat.ch/trunk/web/geonetwork/loc/fra/xml/strings.xml 2009-01-12 09:33:27 UTC (rev 1932)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<strings>
+ <refineSearch.title>Précisez votre recherche</refineSearch.title>
<parent>Consulter la fiche du parent</parent>
<userdetails>User details</userdetails>
<publicaccess>Allow user to be used in metadata records</publicaccess>
Modified: sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19115/index-fields.xsl
===================================================================
--- sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19115/index-fields.xsl 2009-01-12 07:44:08 UTC (rev 1931)
+++ sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19115/index-fields.xsl 2009-01-12 09:33:27 UTC (rev 1932)
@@ -79,7 +79,8 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- === Responsible organization === -->
<xsl:for-each select="/Metadata/mdContact/rpOrgName">
- <Field name="orgName" string="{string(.)}" store="true" index="true" token="true"/>
+ <Field name="orgName" string="{string(.)}" store="true" index="true" token="true"/>
+ <Field name="_orgName" string="{string(.)}" store="true" index="true" token="false"/>
</xsl:for-each>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
Modified: sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19139/index-fields.xsl
===================================================================
--- sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19139/index-fields.xsl 2009-01-12 07:44:08 UTC (rev 1931)
+++ sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19139/index-fields.xsl 2009-01-12 09:33:27 UTC (rev 1932)
@@ -162,7 +162,8 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<xsl:for-each select="gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString">
- <Field name="orgName" string="{string(.)}" store="true" index="true" token="true"/>
+ <Field name="orgName" string="{string(.)}" store="true" index="true" token="true"/>
+ <Field name="_orgName" string="{string(.)}" store="true" index="true" token="false"/>
</xsl:for-each>
<xsl:for-each select="gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString">
<Field name="creator" string="{string(.)}" store="true" index="true" token="true"/>
Modified: sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19139/language-index-fields.xsl
===================================================================
--- sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19139/language-index-fields.xsl 2009-01-12 07:44:08 UTC (rev 1931)
+++ sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19139/language-index-fields.xsl 2009-01-12 09:33:27 UTC (rev 1932)
@@ -180,7 +180,8 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<xsl:for-each select="gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:organisationName//gmd:LocalisedCharacterString[@locale=$langId]">
- <Field name="orgName" string="{string(.)}" store="true" index="true" token="true"/>
+ <Field name="orgName" string="{string(.)}" store="true" index="true" token="true"/>
+ <Field name="_orgName" string="{string(.)}" store="true" index="true" token="false"/>
</xsl:for-each>
<xsl:for-each select="gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString|
gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:individualFirstName/gco:CharacterString|
Modified: sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19139.che/index-fields.xsl
===================================================================
--- sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19139.che/index-fields.xsl 2009-01-12 07:44:08 UTC (rev 1931)
+++ sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19139.che/index-fields.xsl 2009-01-12 09:33:27 UTC (rev 1932)
@@ -172,7 +172,8 @@
<xsl:for-each select="gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString|
gmd:pointOfContact/che:CHE_CI_ResponsibleParty/gmd:organisationName/gco:CharacterString">
- <Field name="orgName" string="{string(.)}" store="true" index="true" token="true"/>
+ <Field name="orgName" string="{string(.)}" store="true" index="true" token="true"/>
+ <Field name="_orgName" string="{string(.)}" store="true" index="true" token="false"/>
</xsl:for-each>
<xsl:for-each select="gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString|
gmd:pointOfContact/che:CHE_CI_ResponsibleParty/gmd:individualFirstName/gco:CharacterString|
Modified: sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19139.che/language-index-fields.xsl
===================================================================
--- sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19139.che/language-index-fields.xsl 2009-01-12 07:44:08 UTC (rev 1931)
+++ sandbox/geocat.ch/trunk/web/geonetwork/xml/schemas/iso19139.che/language-index-fields.xsl 2009-01-12 09:33:27 UTC (rev 1932)
@@ -181,7 +181,8 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<xsl:for-each select="gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:organisationName//gmd:LocalisedCharacterString[@locale=$langId]">
- <Field name="orgName" string="{string(.)}" store="true" index="true" token="true"/>
+ <Field name="orgName" string="{string(.)}" store="true" index="true" token="true"/>
+ <Field name="_orgName" string="{string(.)}" store="true" index="true" token="false"/>
</xsl:for-each>
<xsl:for-each select="gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString|
gmd:pointOfContact/che:CHE_CI_ResponsibleParty/gmd:individualFirstName/gco:CharacterString|
Modified: sandbox/geocat.ch/trunk/web/geonetwork/xsl/banner.xsl
===================================================================
--- sandbox/geocat.ch/trunk/web/geonetwork/xsl/banner.xsl 2009-01-12 07:44:08 UTC (rev 1931)
+++ sandbox/geocat.ch/trunk/web/geonetwork/xsl/banner.xsl 2009-01-12 09:33:27 UTC (rev 1932)
@@ -21,8 +21,15 @@
<!-- buttons -->
<tr class="banner">
<td class="banner-menu">
- <a class="banner" href="geocat"><xsl:value-of select="/root/gui/strings/home"/></a>
- |
+ <xsl:choose>
+ <xsl:when test="/root/gui/reqService='geocat' or /root/gui/reqService='user.login' or /root/gui/reqService='user.logout'">
+ <font class="banner-active"><xsl:value-of select="/root/gui/strings/home"/></font>
+ </xsl:when>
+ <xsl:otherwise>
+ <a class="banner" href="geocat"><xsl:value-of select="/root/gui/strings/home"/></a>
+ </xsl:otherwise>
+ </xsl:choose>
+ |
<xsl:if test="string(/root/gui/session/userId)!=''">
<xsl:choose>
<xsl:when test="/root/gui/reqService='admin'">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|