svn commit: r1537507 - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1537507 - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Author: jleroux
Date: Thu Oct 31 14:42:14 2013 New Revision: 1537507 URL: http://svn.apache.org/r1537507 Log: Merges trunk HEAD Added: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/scripting/groovy-all-2.1.9.jar - copied unchanged from r1537505, ofbiz/trunk/framework/base/lib/scripting/groovy-all-2.1.9.jar Removed: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/scripting/groovy-all-1.8.6.jar Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed) ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/messages.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/config/entityengine.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/macros.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1536983-1537505 Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath?rev=1537507&r1=1537506&r2=1537507&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath Thu Oct 31 14:42:14 2013 @@ -97,7 +97,7 @@ <classpathentry kind="lib" path="framework/base/lib/scripting/asm-util-3.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/bsf-2.4.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/bsh-2.0b4.jar"/> - <classpathentry kind="lib" path="framework/base/lib/scripting/groovy-all-1.8.6.jar"/> + <classpathentry kind="lib" path="framework/base/lib/scripting/groovy-all-2.1.9.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/jakarta-oro-2.0.8.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/> <classpathentry kind="lib" path="specialpurpose/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE?rev=1537507&r1=1537506&r2=1537507&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE Thu Oct 31 14:42:14 2013 @@ -69,7 +69,7 @@ framework/base/lib/j2eespecs/jsp-api-2.2 framework/base/lib/j2eespecs/servlet-api-3.0.jar framework/base/lib/scripting/bsf-2.4.0.jar framework/base/lib/scripting/jakarta-oro-2.0.8.jar -framework/base/lib/scripting/groovy-all-1.8.6.jar +framework/base/lib/scripting/groovy-all-2.1.9.jar framework/base/lib/scripting/jansi-1.2.1.jar framework/base/lib/xmlrpc-client-3.1.2.jar framework/base/lib/xmlrpc-common-3.1.2.jar Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=1537507&r1=1537506&r2=1537507&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Thu Oct 31 14:42:14 2013 @@ -1198,7 +1198,7 @@ under the License. </if-compare-field> <!-- An inventory item detail record is created to keep track of the units (value) that we are going to add to the inventory account --> <set from-field="costInventoryItem.inventoryItemId" field="createDetailMap.inventoryItemId"/> - <set value="${-1 * costInventoryItemQuantity}" field="createDetailMap.accountingQuantityDiff" type="BigDecimal"/> + <set value="${(-1) * costInventoryItemQuantity}" field="createDetailMap.accountingQuantityDiff" type="BigDecimal"/> <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/> <calculate field="costInventoryItemAmount" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/messages.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/messages.ftl?rev=1537507&r1=1537506&r2=1537507&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/messages.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/messages.ftl Thu Oct 31 14:42:14 2013 @@ -40,26 +40,25 @@ under the License. <div id="content-messages" class="content-messages errorMessage" onclick="document.getElementById('content-messages').parentNode.removeChild(this)"> <p>${uiLabelMap.CommonFollowingErrorsOccurred}:</p> <#if errorMessage?has_content> - <p>${errorMessage}</p> + <p>${StringUtil.wrapString(errorMessage)}</p> </#if> <#if errorMessageList?has_content> <#list errorMessageList as errorMsg> - <p>${errorMsg}</p> + <p>${StringUtil.wrapString(errorMsg)}</p> </#list> </#if> </div> </#if> - <#-- display the event messages --> <#if (eventMessage?has_content || eventMessageList?has_content)> <div id="content-messages" class="content-messages eventMessage" onclick="document.getElementById('content-messages').parentNode.removeChild(this)"> <p>${uiLabelMap.CommonFollowingOccurred}:</p> <#if eventMessage?has_content> - <p>${eventMessage}</p> + <p>${StringUtil.wrapString(eventMessage)}</p> </#if> <#if eventMessageList?has_content> <#list eventMessageList as eventMsg> - <p>${eventMsg}</p> + <p>${StringUtil.wrapString(eventMsg)}</p> </#list> </#if> </div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/config/entityengine.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/config/entityengine.xml?rev=1537507&r1=1537506&r2=1537507&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/config/entityengine.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/config/entityengine.xml Thu Oct 31 14:42:14 2013 @@ -102,7 +102,6 @@ access. For a detailed description see t <field-type name="axion" loader="fieldfile" location="fieldtypeaxion.xml"/> <field-type name="mysql" loader="fieldfile" location="fieldtypemysql.xml"/> <field-type name="postgres" loader="fieldfile" location="fieldtypepostgres.xml"/> - <field-type name="postnew" loader="fieldfile" location="fieldtypepostnew.xml"/> <field-type name="oracle" loader="fieldfile" location="fieldtypeoracle.xml"/> <field-type name="sapdb" loader="fieldfile" location="fieldtypesapdb.xml"/> <field-type name="sybase" loader="fieldfile" location="fieldtypesybase.xml"/> @@ -487,7 +486,7 @@ access. For a detailed description see t <datasource name="localpostolap" helper-class="org.ofbiz.entity.datasource.GenericHelperDAO" schema-name="public" - field-type-name="postnew" + field-type-name="postgres" check-on-start="true" add-missing-on-start="true" use-fk-initially-deferred="false" @@ -524,7 +523,7 @@ access. For a detailed description see t <datasource name="localposttenant" helper-class="org.ofbiz.entity.datasource.GenericHelperDAO" schema-name="public" - field-type-name="postnew" + field-type-name="postgres" check-on-start="true" add-missing-on-start="true" use-fk-initially-deferred="false" Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/macros.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/macros.xml?rev=1537507&r1=1537506&r2=1537507&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/macros.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/macros.xml Thu Oct 31 14:42:14 2013 @@ -57,7 +57,7 @@ under the License. <pathelement location="${ofbiz.home.dir}/framework/base/lib/commons/commons-cli-1.0.jar"/> <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/antlr-2.7.6.jar"/> <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/asm-3.2.jar"/> - <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/groovy-all-1.8.6.jar"/> + <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/groovy-all-2.1.9.jar"/> </path> <path id="rhino.class.path"> <pathelement location="${ofbiz.home.dir}/extension/rhino/lib/js-1.7.R1.jar"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy?rev=1537507&r1=1537506&r2=1537507&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy Thu Oct 31 14:42:14 2013 @@ -27,35 +27,26 @@ import org.ofbiz.base.util.UtilHttp import org.ofbiz.content.search.SearchWorker import org.ofbiz.product.feature.ParametricSearch import org.apache.lucene.search.* -import org.apache.lucene.store.Directory import org.apache.lucene.index.DirectoryReader -paramMap = UtilHttp.getParameterMap(request); -queryLine = paramMap.queryLine.toString(); -Debug.logInfo("in search, queryLine:" + queryLine, ""); - -siteId = paramMap.lcSiteId; -Debug.logInfo("in search, siteId:" + siteId, ""); - -searchFeature1 = (String) paramMap.SEARCH_FEAT; -searchFeature2 = (String) paramMap.SEARCH_FEAT2; -searchFeature3 = (String) paramMap.SEARCH_FEAT3; +queryLine = parameters.queryLine; -featureIdByType = ParametricSearch.makeFeatureIdByTypeMap(paramMap); -Debug.logInfo("in search, featureIdByType:" + featureIdByType, ""); +siteId = parameters.lcSiteId; + +searchFeature1 = (String) parameters.SEARCH_FEAT; +searchFeature2 = (String) parameters.SEARCH_FEAT2; +searchFeature3 = (String) parameters.SEARCH_FEAT3; + +featureIdByType = ParametricSearch.makeFeatureIdByTypeMap(UtilHttp.getParameterMap(request)); combQuery = new BooleanQuery(); -Directory directory = FSDirectory.open(new File(SearchWorker.getIndexPath("content"))); -DirectoryReader reader = DirectoryReader.open(directory); try { - Debug.logInfo("in search, indexPath:" + directory.toString(), ""); + DirectoryReader reader = DirectoryReader.open(FSDirectory.open(new File(SearchWorker.getIndexPath("content")))); searcher = new IndexSearcher(reader); - Debug.logInfo("in search, searcher:" + searcher, ""); analyzer = new StandardAnalyzer(SearchWorker.LUCENE_VERSION); } catch (java.io.FileNotFoundException e) { - request.setAttribute("errorMsgReq", "No index file exists."); - Debug.logError("in search, error:" + e.getMessage(), ""); + context.errorMessageList.add(e.getMessage()); return; } @@ -79,7 +70,7 @@ if (queryLine || siteId) { if (searchFeature1 || searchFeature2 || searchFeature3 || !featureIdByType.isEmpty()) { featureQuery = new BooleanQuery(); featuresRequired = BooleanClause.Occur.MUST; - if ("any".equals(paramMap.any_or_all)) { + if ("any".equals(parameters.any_or_all)) { featuresRequired = BooleanClause.Occur.SHOULD; } @@ -111,11 +102,9 @@ if (searchFeature1 || searchFeature2 || } } if (searcher) { - Debug.logInfo("in search searchFeature3, combQuery:" + combQuery.toString(), ""); TopScoreDocCollector collector = TopScoreDocCollector.create(100, false); //defaulting to 100 results searcher.search(combQuery, collector); ScoreDoc[] hits = collector.topDocs().scoreDocs; - Debug.logInfo("in search, hits:" + collector.getTotalHits(), ""); contentList = [] as ArrayList; hitSet = [:] as HashSet; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |