Author: knguyen
Date: Fri Jun 8 17:36:28 2007
New Revision: 17534
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17534&repname=
=3Djahia
Log:
SEARCH-86: shows the virtual name from which the search result come from
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ParamBean.j=
ava
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/search/Pa=
geSearchResultBuilderImpl.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/Param=
Bean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/params/ParamBean.java&rev=3D17534&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ParamBean.j=
ava (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ParamBean.j=
ava Fri Jun 8 17:36:28 2007
@@ -1737,8 +1737,12 @@
if (defaultValue =3D=3D null) {
return result;
} else {
- if (defaultValue.equals(parameterValue)) {
- return "";
+ if (defaultValue.equals(parameterValue)){
+ if ( parameterName.equals(SITE_KEY_PARAMETER) && this.isFo=
rceAppendSiteKey() ) {
+ return result;
+ } else {
+ return "";
+ }
} else {
return result;
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/Proce=
ssingContext.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/params/ProcessingContext.java&rev=3D17534&r=
epname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java Fri Jun 8 17:36:28 2007
@@ -298,6 +298,7 @@
=
private ThreadLocal filtersStatus =3D new ThreadLocal();
=
+ private boolean forceAppendSiteKey =3D false;
=
static {
/** todo we might want to put this in a configuration file so the
@@ -875,6 +876,18 @@
this.inAdminMode =3D inAdminMode;
}
=
+ /**
+ * If true, the /site/sitekey will be added to the page url
+ * @return
+ */
+ public boolean isForceAppendSiteKey() {
+ return forceAppendSiteKey;
+ }
+
+ public void setForceAppendSiteKey(boolean forceAppendSiteKey) {
+ this.forceAppendSiteKey =3D forceAppendSiteKey;
+ }
+
//--------------------------------------------------------------------=
-----
=
/**
@@ -1732,6 +1745,14 @@
theUrl.append(getEngineURLPart(CORE_ENGINE_NAME));
if ( page.getJahiaID() =3D=3D getSite().getID() ){
theUrl.append(getSiteURLPart(getSite().getSiteKey()));
+ } else {
+ try {
+ JahiaSite site =3D ServicesRegistry.getInstance().getJahia=
SitesService()
+ .getSite(page.getJahiaID());
+ theUrl.append(getSiteURLPart(site.getSiteKey()));
+ } catch ( Throwable t ){
+ logger.debug("Exception retrieving site",t);
+ }
}
theUrl.append(getOpModeURLPart(getOpMode()));
theUrl.append(getCacheModeURLPart(cacheStatus));
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/sea=
rch/PageSearchResultBuilderImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/search/PageSearchResultBuilderImpl=
.java&rev=3D17534&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/search/Pa=
geSearchResultBuilderImpl.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/search/Pa=
geSearchResultBuilderImpl.java Fri Jun 8 17:36:28 2007
@@ -232,6 +232,7 @@
if (contentObject instanceof ContentPage) {
value =3D aPage.getTitle();
try {
+ jParams.setForceAppendSiteKey(true);
if (aPage.getPageType() =3D=3D JahiaPa=
ge.TYPE_URL) {
url =3D aPage.getRemoteURL();
} else if (aPage.getPageType() =3D=3D =
JahiaPage.TYPE_DIRECT) {
@@ -240,6 +241,8 @@
url =3D aPage.getURL(jParams);
}
} catch (Throwable t) {
+ } finally {
+ jParams.setForceAppendSiteKey(false);
}
} else if (isFile) {
try {
@@ -260,12 +263,15 @@
} else {
value =3D aPage.getTitle();
try {
+ jParams.setForceAppendSiteKey(true);
if (aPage.getPageType() =3D=3D JahiaPa=
ge.TYPE_DIRECT) {
url =3D aPage.getURL(jParams);
} else if (aPage.getPageType() =3D=3D =
JahiaPage.TYPE_URL) {
url =3D aPage.getRemoteURL();
}
} catch (Throwable t) {
+ } finally {
+ jParams.setForceAppendSiteKey(false);
}
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
