You can subscribe to this list here.
2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(76) |
Oct
(8) |
Nov
(13) |
Dec
(7) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2005 |
Jan
(41) |
Feb
(2) |
Mar
(68) |
Apr
(4) |
May
(12) |
Jun
(54) |
Jul
(56) |
Aug
(95) |
Sep
(21) |
Oct
(45) |
Nov
(33) |
Dec
(265) |
2006 |
Jan
(306) |
Feb
(158) |
Mar
(152) |
Apr
(498) |
May
(427) |
Jun
(594) |
Jul
(1378) |
Aug
(1374) |
Sep
(991) |
Oct
(713) |
Nov
(1129) |
Dec
(629) |
2007 |
Jan
(706) |
Feb
(662) |
Mar
(816) |
Apr
(814) |
May
(664) |
Jun
(914) |
Jul
(372) |
Aug
(356) |
Sep
(258) |
Oct
(360) |
Nov
(128) |
Dec
(304) |
2008 |
Jan
(190) |
Feb
(204) |
Mar
(551) |
Apr
(378) |
May
(89) |
Jun
(66) |
Jul
(84) |
Aug
(15) |
Sep
(34) |
Oct
(4) |
Nov
(2) |
Dec
(12) |
2009 |
Jan
(3) |
Feb
(77) |
Mar
(20) |
Apr
(17) |
May
(70) |
Jun
(5) |
Jul
(11) |
Aug
(25) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
From: Jose C. <jos...@us...> - 2009-08-10 08:08:05
|
Update of /cvsroot/gbif/portal-core In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7301 Modified Files: pom.xml Log Message: httpclient dependency upgrade (3.0.1 --> 3.1) Index: pom.xml =================================================================== RCS file: /cvsroot/gbif/portal-core/pom.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** pom.xml 25 Mar 2009 17:27:26 -0000 1.23 --- pom.xml 10 Aug 2009 08:07:54 -0000 1.24 *************** *** 99,103 **** <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> ! <version>3.0.1</version> </dependency> <dependency> --- 99,103 ---- <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> ! <version>3.1</version> </dependency> <dependency> |
From: Jose C. <jos...@us...> - 2009-07-30 13:30:46
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/common In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18520/src/main/webapp/common Modified Files: footer.jsp Log Message: Added link to GBIF's communication portal. Index: footer.jsp =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/common/footer.jsp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** footer.jsp 27 Mar 2008 14:25:50 -0000 1.8 --- footer.jsp 30 Jul 2009 13:30:36 -0000 1.9 *************** *** 1,5 **** <%@ include file="/common/taglibs.jsp"%> <div id="footer"> ! <p id="copyright">Layout & design © GBIF. <spring:message code="copyright.2"/></p><p id="contact_webmaster"><a href="mailto:po...@gb..."><spring:message code="contact.us"/></a></p> </div> <script type="text/javascript"> --- 1,5 ---- <%@ include file="/common/taglibs.jsp"%> <div id="footer"> ! <p id="copyright">Layout & design © <a href="http://www.gbif.org" target="_blank">GBIF</a>. <spring:message code="copyright.2"/></p><p id="contact_webmaster"><a href="mailto:po...@gb..."><spring:message code="contact.us"/></a></p> </div> <script type="text/javascript"> |
From: Jose C. <jos...@us...> - 2009-07-30 13:17:29
|
Update of /cvsroot/gbif/portal-service/src/main/resources/org/gbif/portal/service/impl In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16576/src/main/resources/org/gbif/portal/service/impl Modified Files: applicationContext-service.xml Log Message: Inline bean definition for requestUtils property. This is to use a particular timeout while making a request to a data provider, as the actual requestUtils bean is used by harvesting purposes elsewhere. Index: applicationContext-service.xml =================================================================== RCS file: /cvsroot/gbif/portal-service/src/main/resources/org/gbif/portal/service/impl/applicationContext-service.xml,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** applicationContext-service.xml 6 Apr 2009 14:54:15 -0000 1.80 --- applicationContext-service.xml 30 Jul 2009 13:17:14 -0000 1.81 *************** *** 187,191 **** <bean class="org.gbif.portal.service.provider.impl.DataProviderServicesImpl"> <property name="occurrenceRecordDAO" ref="occurrenceRecordDAORO"/> ! <property name="requestUtils" ref="requestUtils"/> <property name="messageUtils" ref="messageUtils"/> <property name="templateUtils" ref="templateUtils"/> --- 187,195 ---- <bean class="org.gbif.portal.service.provider.impl.DataProviderServicesImpl"> <property name="occurrenceRecordDAO" ref="occurrenceRecordDAORO"/> ! <property name="requestUtils"> ! <bean class="org.gbif.portal.util.request.RequestUtils"> ! <property name="timeoutInMillisec" value="25000"/> ! </bean> ! </property> <property name="messageUtils" ref="messageUtils"/> <property name="templateUtils" ref="templateUtils"/> |
From: Jose C. <jos...@us...> - 2009-07-24 09:49:17
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/classes In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8097/src/main/webapp/WEB-INF/classes Modified Files: messages_es.properties Log Message: Bug Fix #335: Incorrectly displaying dates fixed. There was an error with the date format property in the spanish properties file. Index: messages_es.properties =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/classes/messages_es.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** messages_es.properties 18 Jun 2008 12:06:40 -0000 1.2 --- messages_es.properties 24 Jul 2009 09:49:09 -0000 1.3 *************** *** 158,163 **** # The decorators for dates ! I18nDateDecorator.date.format=dd/MM/aaaa ! I18nDateTimeDecorator.date.format=dd/MM/aaaa - HH:mm # Page Header titles --- 158,163 ---- # The decorators for dates ! I18nDateDecorator.date.format=dd/MM/yyyy ! I18nDateTimeDecorator.date.format=dd/MM/yyyy - HH:mm # Page Header titles |
From: Jose C. <jos...@us...> - 2009-07-23 09:52:36
|
Update of /cvsroot/gbif/portal-core/src/main/java/org/gbif/portal/util/geospatial In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1333/src/main/java/org/gbif/portal/util/geospatial Modified Files: CellIdUtils.java Log Message: Fixed centi-cell accuracy when returning occurrence records within a 1 degree area Index: CellIdUtils.java =================================================================== RCS file: /cvsroot/gbif/portal-core/src/main/java/org/gbif/portal/util/geospatial/CellIdUtils.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** CellIdUtils.java 16 Jun 2008 09:31:33 -0000 1.13 --- CellIdUtils.java 23 Jul 2009 09:52:29 -0000 1.14 *************** *** 315,326 **** public static Integer[] getCentiCellIdForBoundingBox(float minLongitude, float minLatitude, float maxLongitude, float maxLatitude) throws UnableToGenerateCellIdException { ! int[] maxMinCellIds = getMinMaxCellIdsForBoundingBox(minLongitude, minLatitude, maxLongitude, maxLatitude); ! if(maxMinCellIds==null || (maxMinCellIds[0]!=maxMinCellIds[1])) ! return null; ! Integer cellid = maxMinCellIds[0]; //ascertain whether bounding box is 0.1 by 0.1 ! if(isBoundingBoxCentiCell(minLongitude, minLatitude, maxLongitude, maxLatitude)){ int minCentiCell = toCentiCellId(minLatitude, minLongitude); --- 315,335 ---- public static Integer[] getCentiCellIdForBoundingBox(float minLongitude, float minLatitude, float maxLongitude, float maxLatitude) throws UnableToGenerateCellIdException { ! //int[] maxMinCellIds = getMinMaxCellIdsForBoundingBox(minLongitude, minLatitude, maxLongitude, maxLatitude); ! //if(maxMinCellIds==null || (maxMinCellIds[0]!=maxMinCellIds[1])) ! // return null; ! //Integer cellid = maxMinCellIds[0]; ! ! //int[] maxMinCellIds = getMinMaxCellIdsForBoundingBox(minLongitude, minLatitude, maxLongitude, maxLatitude); ! ! if(!(isBoundingBoxCentiCell(minLongitude, minLatitude, maxLongitude, maxLatitude))) { ! return null; ! } //ascertain whether bounding box is 0.1 by 0.1 ! //if(isBoundingBoxCentiCell(minLongitude, minLatitude, maxLongitude, maxLatitude)){ ! ! int[] maxMinCellIds = getMinMaxCellIdsForBoundingBox(minLongitude, minLatitude, maxLongitude, maxLatitude); ! Integer cellid = maxMinCellIds[0]; int minCentiCell = toCentiCellId(minLatitude, minLongitude); *************** *** 347,355 **** } ! if(maxCentiCell==minCentiCell){ return new Integer[]{cellid, minCentiCell}; ! } ! } ! return new Integer[]{cellid}; } --- 356,364 ---- } ! //if(maxCentiCell==minCentiCell){ return new Integer[]{cellid, minCentiCell}; ! //} ! //} ! //return new Integer[]{cellid}; } |
From: Jose C. <jos...@us...> - 2009-07-23 09:51:40
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp/taxonomy/drilldown In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1059/src/main/webapp/WEB-INF/jsp/taxonomy/drilldown Modified Files: mapLinks.jsp Log Message: Adding disclaimer statement to maps Index: mapLinks.jsp =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp/taxonomy/drilldown/mapLinks.jsp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** mapLinks.jsp 29 Jan 2008 14:18:23 -0000 1.13 --- mapLinks.jsp 23 Jul 2009 09:51:30 -0000 1.14 *************** *** 11,18 **** --- 11,20 ---- <c:set var="a1"><span class="subject"><fmt:formatNumber value="${occurrenceCount}" pattern="###,###"/></span></c:set> <spring:message code="maps.records.with.coordinates.fullcount" arguments="${a0}%%%${a1}" argumentSeparator="%%%"/> + <br/><spring:message code="maps.records.disclaimer"/> </c:when> <c:otherwise> <c:set var="a0"><span class="subject"><fmt:formatNumber value="${pointsTotal}" pattern="###,###"/></span></c:set> <spring:message code="maps.records.with.coordinates" arguments="${a0}" argumentSeparator="%%%"/> + <br/><spring:message code="maps.records.disclaimer"/> </c:otherwise> </c:choose> |
From: Jose C. <jos...@us...> - 2009-07-23 09:51:35
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/classes In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1059/src/main/webapp/WEB-INF/classes Modified Files: messages.properties Log Message: Adding disclaimer statement to maps Index: messages.properties =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/classes/messages.properties,v retrieving revision 1.267 retrieving revision 1.268 diff -C2 -d -r1.267 -r1.268 *** messages.properties 18 Jun 2009 13:24:05 -0000 1.267 --- messages.properties 23 Jul 2009 09:51:30 -0000 1.268 *************** *** 379,382 **** --- 379,383 ---- occurrence.record.dataset.legend=Dataset occurrence.record.dataresource=Dataset + occurrence.record.dataresource.rights=Rights occurrence.record.dataprovider=Data Provider occurrence.record.taxonomy.legend=Taxonomy *************** *** 703,710 **** maps.no.georeferenced.points=No georeferenced records currently available for maps.records.with.no.geospatial.issues=Only records with no geospatial issues are plotted maps.records.with.coordinates.fullcount=This map only shows records with coordinates ({0} records from a total of {1} records). maps.records.with.coordinates.fullcount.one=This map only shows records with coordinates (one record from a total of {0} records). maps.records.with.coordinates=This map only shows records with coordinates ({0} records with coordinates). ! maps.records.not.full.distribution=This shows only records from the GBIF network and may not properly represent the total distribution of {0}. maps.records.provider.composite=It includes records from all datasets shared by this data provider. maps.records.network.composite=It includes records from all datasets in the network. --- 704,712 ---- maps.no.georeferenced.points=No georeferenced records currently available for maps.records.with.no.geospatial.issues=Only records with no geospatial issues are plotted + maps.records.disclaimer=<b>Disclaimer</b>: Maps depict density of data registered within the GBIF network index and not necessarily true species occurrence density gradients. maps.records.with.coordinates.fullcount=This map only shows records with coordinates ({0} records from a total of {1} records). maps.records.with.coordinates.fullcount.one=This map only shows records with coordinates (one record from a total of {0} records). maps.records.with.coordinates=This map only shows records with coordinates ({0} records with coordinates). ! maps.records.not.full.distribution=The data in the GBIF network index may not represent the full distribution of {0}. maps.records.provider.composite=It includes records from all datasets shared by this data provider. maps.records.network.composite=It includes records from all datasets in the network. |
From: Jose C. <jos...@us...> - 2009-07-23 09:51:35
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp/geography In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1059/src/main/webapp/WEB-INF/jsp/geography Modified Files: mapPointCount.jsp Log Message: Adding disclaimer statement to maps Index: mapPointCount.jsp =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp/geography/mapPointCount.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mapPointCount.jsp 13 Mar 2008 16:05:53 -0000 1.7 --- mapPointCount.jsp 23 Jul 2009 09:51:30 -0000 1.8 *************** *** 7,10 **** --- 7,11 ---- <tiles:insert page="viewableArea.jsp"/> (<gbiftag:boundingBox/>) + <br /><spring:message code="maps.records.disclaimer"/> </c:when> <c:when test="${occurrenceCount!=null && occurrenceCount>0 && pointsTotal>0}"> *************** *** 12,19 **** --- 13,22 ---- <c:set var="a1"><span class="subject"><fmt:formatNumber value="${occurrenceCount}" pattern="###,###"/></span></c:set> <spring:message code="maps.records.with.coordinates.fullcount" arguments="${a0}%%%${a1}" argumentSeparator="%%%"/> + <br/><spring:message code="maps.records.disclaimer"/> </c:when> <c:when test="${pointsTotal>0}"> <c:set var="a0"><fmt:formatNumber value="${pointsTotal}" pattern="###,###"/></c:set> <spring:message code="maps.records.with.coordinates" arguments="${a0}" argumentSeparator="%%%"/> + <br/><spring:message code="maps.records.disclaimer"/> </c:when> </c:choose> \ No newline at end of file |
From: Jose C. <jos...@us...> - 2009-07-23 09:48:52
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv542/src/main/webapp/WEB-INF Modified Files: web.xml Added Files: webServiceDispatcher-servlet.xml Removed Files: webServiceDispatcher2-servlet.xml Log Message: Just renaming webServiceDispatcher2-servlet to webServiceDispatcher-servlet and making the necessary modifications on web.xml Index: web.xml =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/web.xml,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** web.xml 24 Feb 2009 15:38:52 -0000 1.46 --- web.xml 23 Jul 2009 09:48:43 -0000 1.47 *************** *** 131,135 **** <!-- The Servlet that will dispatch to the webservices --> <servlet> ! <servlet-name>webServiceDispatcher2</servlet-name> <servlet-class> org.springframework.web.servlet.DispatcherServlet</servlet-class> <load-on-startup>17</load-on-startup> --- 131,135 ---- <!-- The Servlet that will dispatch to the webservices --> <servlet> ! <servlet-name>webServiceDispatcher</servlet-name> <servlet-class> org.springframework.web.servlet.DispatcherServlet</servlet-class> <load-on-startup>17</load-on-startup> *************** *** 142,146 **** <!-- New WS implementation --> <servlet-mapping> ! <servlet-name>webServiceDispatcher2</servlet-name> <url-pattern>/ws/*</url-pattern> </servlet-mapping> --- 142,146 ---- <!-- New WS implementation --> <servlet-mapping> ! <servlet-name>webServiceDispatcher</servlet-name> <url-pattern>/ws/*</url-pattern> </servlet-mapping> --- NEW FILE: webServiceDispatcher-servlet.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd" > <beans default-autowire="no" default-dependency-check="none" default-lazy-init="false"> <description> This is configuration of the Web services servlet </description> <bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping"> <property name="urlMap"> <map> <!-- <entry key="/soap/occurrence/**/*"> <ref bean="occurrenceSoapService" /> </entry> <entry key="/soap/taxon/**/*"> <ref bean="taxonSoapService" /> </entry> <entry key="/soap/network/**/*"> <ref bean="networkSoapService" /> </entry> <entry key="/rest/**/*"> <ref bean="wsRestRewriteController" /> </entry> <entry key="/wfs/**/*"> <ref bean="wsRestRewriteController" /> </entry> <entry key="/rest/*"> <ref bean="wsRestRewriteController" /> </entry> <entry key="/wfs/*"> <ref bean="wsRestRewriteController" /> </entry> --> <entry key="/rest/**/*"> <ref bean="wsRestRewriteController" /> </entry> <entry key="/rest/*"> <ref bean="wsRestRewriteController" /> </entry> <entry key="/ws/*"> <ref bean="wsRestRewriteController" /> </entry> <entry key="/"> <ref bean="webserviceController" /> </entry> <!-- <entry key="/guid/occurrence/*"> <ref bean="occurrenceWebserviceController" /> </entry> --> </map> </property> </bean> <!-- Webservice occurrence controller <bean id="occurrenceWebserviceController" class="org.gbif.portal.web.controller.webservices.OccurrenceWebserviceController" abstract="true"> <property name="geospatialManager" ref="geospatialManager" /> <property name="scientificNameFilter" ref="scientificNameFilter" /> <property name="dataProviderServices" ref="dataProviderServices" /> <property name="urlRoot" value="occurrences" /> <property name="viewNamePrefix" value="occurrenceRecord" /> <property name="defaultView" value="/welcome.htm" /> <property name="queryViewUrl" value="/occurrences/search.htm?" /> <property name="cellWidth" value="1" /> <property name="messageSource" ref="messageSource" /> <property name="userUtils" ref="userUtils" /> <property name="supportedPatterns"> <list> <list> <value>key</value> </list> <list> <value>key</value> <value>view</value> </list> <list> <value>institutionCode</value> <value>collectionCode</value> <value>catalogueNumber</value> </list> <list> <value>institutionCode</value> <value>collectionCode</value> <value>catalogueNumber</value> <value>view</value> </list> </list> </property> </bean> --> <!-- Declare an xfire service factory --> <!-- <bean id="xfire.xmlbeansServiceFactory" class="org.codehaus.xfire.xmlbeans.XmlBeansServiceFactory" singleton="true"> <property name="transportManager"> <ref bean="xfire.transportManager" /> </property> </bean> <bean id="baseWSDef" class="org.codehaus.xfire.spring.remoting.XFireExporter" abstract="true"> <property name="serviceFactory"> <ref bean="xfire.xmlbeansServiceFactory" /> </property> <property name="style" value="wrapped" /> <property name="use" value="literal" /> </bean> <bean id="occurrenceSoapService" parent="baseWSDef"> <property name="serviceBean"> <ref bean="occurrenceAction" /> </property> <property name="serviceInterface"> <value> org.gbif.portal.ws.soap.Occurrence </value> </property> </bean> <bean id="taxonSoapService" parent="baseWSDef"> <property name="serviceBean"> <ref bean="taxonAction" /> </property> <property name="serviceInterface"> <value>org.gbif.portal.ws.soap.Taxon</value> </property> </bean> <bean id="networkSoapService" parent="baseWSDef"> <property name="serviceBean"> <ref bean="networkAction" /> </property> <property name="serviceInterface"> <value>org.gbif.portal.ws.soap.Network</value> </property> </bean> <bean id="wsRestRewriteController" class="org.gbif.portal.web.controller.RedirectToUrlParamsController"> <property name="targetController" ref="wsRestDispatcher" /> <property name="pathMapping" ref="wsRestPathMapping" /> </bean> --> <bean id="wsRestRewriteController" class="org.gbif.portal.web.controller.RedirectToUrlParamsController"> <property name="targetController" ref="wsRestDispatcher" /> <property name="pathMapping" ref="wsRestPathMapping" /> </bean> <bean id="wsRestDispatcher" class="org.gbif.portal.webservices.rest.Dispatcher"> <property name="occurrenceAction" ref="occurrenceAction" /> <property name="providerAction" ref="providerAction" /> <property name="resourceAction" ref="resourceAction" /> <property name="taxonAction" ref="taxonAction" /> <property name="networkAction" ref="networkAction" /> <property name="densityAction" ref="densityAction" /> <!-- <property name="xmlOptions" ref="xmlOptions" /> --> <property name="templateUtils" ref="templateUtils"/> <property name="pathMapping" ref="wsRestPathMapping" /> </bean> <bean id="occurrenceAction" class="org.gbif.portal.webservices.actions.OccurrenceAction"> <property name="occurrenceManager" ref="occurrenceManager" /> <property name="taxonomyManager" ref="taxonomyManager" /> <property name="tripletOccurrenceManager" ref="tripletFullDetailedOccurrenceManager" /> <property name="tripletOccurrenceKMLManager" ref="tripletOccurrenceKMLManager" /> <property name="tripletOccurrenceCountsManager" ref="tripletOccurrenceCountsManager" /> <property name="dataResourceManager" ref="dataResourceManager" /> <property name="pathMapping" ref="wsRestPathMapping" /> <property name="kmlIcons"> <list> <value>/images/GE1.png</value> <value>/images/GE2.png</value> <value>/images/GE3.png</value> <value>/images/GE4.png</value> <value>/images/GE5.png</value> <value>/images/GEcube1.png</value> <value>/images/GEcube2.png</value> <value>/images/GEcube3.png</value> <value>/images/GEcube4.png</value> <value>/images/GEcube5.png</value> <value>/images/GErc1.png</value> <value>/images/GErc2.png</value> <value>/images/GErc3.png</value> <value>/images/GEfl1.png</value> <value>/images/GEcil1.png</value> <value>/images/GEcil2.png</value> <value>/images/GEcil3.png</value> <value>/images/GEcil4.png</value> <value>/images/GEcil5.png</value> <value>/images/GEslp1.png</value> <value>/images/GEslp2.png</value> <value>/images/GEslp3.png</value> <value>/images/GEslp4.png</value> <value>/images/GEslp5.png</value> </list> </property> </bean> <bean id="taxonAction" class="org.gbif.portal.webservices.actions.TaxonAction"> <property name="taxonomyManager" ref="taxonomyManager" /> <property name="dataResourceManager" ref="dataResourceManager" /> <property name="pathMapping" ref="wsRestPathMapping" /> </bean> <bean id="networkAction" class="org.gbif.portal.webservices.actions.NetworkAction"> <property name="dataResourceManager" ref="dataResourceManager" /> <property name="pathMapping" ref="wsRestPathMapping" /> </bean> <bean id="providerAction" class="org.gbif.portal.webservices.actions.ProviderAction"> <property name="dataResourceManager" ref="dataResourceManager" /> <property name="pathMapping" ref="wsRestPathMapping" /> </bean> <bean id="resourceAction" class="org.gbif.portal.webservices.actions.ResourceAction"> <property name="dataResourceManager" ref="dataResourceManager" /> <property name="taxonomyManager" ref="taxonomyManager"/> <property name="pathMapping" ref="wsRestPathMapping" /> </bean> <bean id="densityAction" class="org.gbif.portal.webservices.actions.DensityAction"> <property name="geospatialManager" ref="geospatialManager" /> <property name="taxonomyManager" ref="taxonomyManager" /> <property name="dataResourceManager" ref="dataResourceManager"/> <property name="pathMapping" ref="wsRestPathMapping" /> </bean> <bean id="wsRestPathMapping" class="org.gbif.portal.util.path.PathMapping"> <property name="urlRoot" value="rest" /> <property name="supportedPatterns"> <list> <list> <value>service</value> <value>request</value> <value>key</value> </list> <list> <value>service</value> <value>request</value> </list> <list> <value>service</value> </list> </list> </property> </bean> <!-- Tutorial Controller --> <bean id="webserviceController" class="org.gbif.portal.web.controller.webservices.WebservicesController"> <property name="urlRoot" value="ws"/> <property name="viewNamePrefix" value="tutorialView"/> <property name="defaultView" value="/welcome.htm"/> </bean> </beans> --- webServiceDispatcher2-servlet.xml DELETED --- |
From: Jose C. <jos...@us...> - 2009-07-03 08:53:35
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp/dataset/drilldown/resource In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18358/src/main/webapp/WEB-INF/jsp/dataset/drilldown/resource Modified Files: information.jsp Log Message: Displaying clean citations for datasets. Index: information.jsp =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp/dataset/drilldown/resource/information.jsp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** information.jsp 26 May 2009 10:20:16 -0000 1.26 --- information.jsp 3 Jul 2009 08:53:23 -0000 1.27 *************** *** 13,29 **** <c:set var="currentDate"><gbif:currentDate/></c:set> <c:set var="dataResourceLink"><a href="${urlBase}/datasets/resource/${dataResource.key}">${urlBase}/datasets/resource/${dataResource.key}</a></c:set> - <c:set var="agent"><c:choose><c:when test="${empty dataResource.citableAgent}">${dataResource.dataProviderName}</c:when><c:otherwise>${dataResource.citableAgent}</c:otherwise></c:choose></c:set> <c:choose> <c:when test="${dataResource.overrideCitation}"> <c:if test="${not empty dataResource.citation}"> ! <p><label for="description"><spring:message code="citation.supplied"/>:</label>${dataResource.citation}</p> </c:if> ! <p><label for="description"><spring:message code="how.to.cite"/>:</label>${dataResource.dataProviderName}, ${dataResource.name} <spring:message code="citation.entry" arguments="${dataResourceLink}%%%${currentDate}" argumentSeparator="%%%"/></p> </c:when> <c:when test="${fn:length(dataResource.citation)==0}"> ! <p><label for="description"><spring:message code="how.to.cite"/>:</label>${dataResource.dataProviderName}, ${dataResource.name} <spring:message code="citation.entry" arguments="${dataResourceLink}%%%${currentDate}" argumentSeparator="%%%"/></p> </c:when> <c:otherwise> ! <p><label for="description"><spring:message code="how.to.cite"/>:</label>${dataResource.citation} <spring:message code="citation.entry" arguments="${dataResourceLink}%%%${currentDate}" argumentSeparator="%%%"/></p> </c:otherwise> </c:choose> --- 13,28 ---- <c:set var="currentDate"><gbif:currentDate/></c:set> <c:set var="dataResourceLink"><a href="${urlBase}/datasets/resource/${dataResource.key}">${urlBase}/datasets/resource/${dataResource.key}</a></c:set> <c:choose> <c:when test="${dataResource.overrideCitation}"> <c:if test="${not empty dataResource.citation}"> ! <p><label for="citation"><spring:message code="citation.supplied"/>:</label>${dataResource.citation}</p> </c:if> ! <p><label for="citation"><spring:message code="how.to.cite"/>:</label>${dataResource.dataProviderName}, ${dataResource.name} <spring:message code="citation.entry" arguments="${dataResourceLink}%%%${currentDate}" argumentSeparator="%%%"/></p> </c:when> <c:when test="${fn:length(dataResource.citation)==0}"> ! <p><label for="citation"><spring:message code="how.to.cite"/>:</label>${dataResource.dataProviderName}, ${dataResource.name} <spring:message code="citation.entry" arguments="${dataResourceLink}%%%${currentDate}" argumentSeparator="%%%"/></p> </c:when> <c:otherwise> ! <p><label for="citation"><spring:message code="how.to.cite"/>:</label>${dataResource.citation} <spring:message code="citation.entry" arguments="${dataResourceLink}%%%${currentDate}" argumentSeparator="%%%"/></p> </c:otherwise> </c:choose> |
From: Jose C. <jos...@us...> - 2009-07-03 08:53:26
|
Update of /cvsroot/gbif/portal-web/src/main/java/org/gbif/portal/web/controller/occurrence In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18358/src/main/java/org/gbif/portal/web/controller/occurrence Modified Files: OccurrenceController.java Log Message: Displaying clean citations for datasets. Index: OccurrenceController.java =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/java/org/gbif/portal/web/controller/occurrence/OccurrenceController.java,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** OccurrenceController.java 9 Jun 2008 13:20:57 -0000 1.45 --- OccurrenceController.java 3 Jul 2009 08:53:23 -0000 1.46 *************** *** 115,118 **** --- 115,121 ---- protected String equalsPredicateId = "0"; + /** url base **/ + protected String urlBaseKey = "urlBase"; + /** * Resolve an id to an occurrence record and send to view *************** *** 283,286 **** --- 286,294 ---- } + String url = request.getRequestURL().toString(); + String servletPath = request.getServletPath(); + String urlBase = url.substring(0, url.indexOf(servletPath)); + mav.addObject(urlBaseKey, urlBase); + logUsage(request, occurrenceRecord, rawOccurrenceRecord); //add points for map representations - e.g. google maps |
From: Jose C. <jos...@us...> - 2009-07-03 08:26:45
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp/taxonomy/drilldown In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12565/src/main/webapp/WEB-INF/jsp/taxonomy/drilldown Modified Files: names.jsp Log Message: Change on URL for IPNI's LSIDs Index: names.jsp =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp/taxonomy/drilldown/names.jsp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** names.jsp 1 Aug 2007 10:55:36 -0000 1.29 --- names.jsp 3 Jul 2009 08:26:36 -0000 1.30 *************** *** 132,136 **** <c:choose> <c:when test="${fn:startsWith(remoteConcept.remoteId, 'urn:lsid:')}"> ! <a href="http://lsid.tdwg.org/${remoteConcept.remoteId}">${remoteConcept.remoteId}</a> </c:when> <c:when test="${fn:startsWith(remoteConcept.remoteId, 'doi:')}"> --- 132,136 ---- <c:choose> <c:when test="${fn:startsWith(remoteConcept.remoteId, 'urn:lsid:')}"> ! <a href="http://www.ipni.org/${remoteConcept.remoteId}">${remoteConcept.remoteId}</a> </c:when> <c:when test="${fn:startsWith(remoteConcept.remoteId, 'doi:')}"> |
From: Jose C. <jos...@us...> - 2009-06-23 09:45:57
|
Update of /cvsroot/gbif/portal-core/db In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10533/db Added Files: portal.jpg Log Message: JPG for the portal index's ERD --- NEW FILE: portal.jpg --- (This appears to be a binary file; contents omitted.) |
From: Jose C. <jos...@us...> - 2009-06-18 13:24:49
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21176/src/main/webapp/WEB-INF Modified Files: mainDispatcher-servlet.xml tiles-def.xml Log Message: Page listing bug fixes/enhancements done on the current version of the data portal. Index: tiles-def.xml =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/tiles-def.xml,v retrieving revision 1.147 retrieving revision 1.148 diff -C2 -d -r1.147 -r1.148 *** tiles-def.xml 27 May 2009 09:40:05 -0000 1.147 --- tiles-def.xml 18 Jun 2009 13:24:06 -0000 1.148 *************** *** 95,98 **** --- 95,105 ---- <put name="breadcrumbs" value=""/> </definition> + + <definition name="bugs" extends="mainLayout"> + <put name="subtitle" value="/WEB-INF/jsp/bugsSubtitle.jsp"/> + <put name="headcontent" value="/WEB-INF/jsp/user/headcontent.jsp"/> + <put name="content" value="/WEB-INF/jsp/bugs.jsp"/> + <put name="breadcrumbs" value=""/> + </definition> <!-- Agreement check page --> *************** *** 477,488 **** </definition> - <!-- Settings Tiles --> - <definition name="bugs" extends="mainLayout"> - <put name="subtitle" value="/WEB-INF/jsp/user/subtitle.jsp"/> - <put name="headcontent" value="/WEB-INF/jsp/user/headcontent.jsp"/> - <put name="content" value="/WEB-INF/jsp/bugs.jsp"/> - <put name="breadcrumbs" value=""/> - </definition> - <!-- Images Tile --> <definition name="thumbnails" extends="ajaxHtmlLayout"> --- 484,487 ---- Index: mainDispatcher-servlet.xml =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/mainDispatcher-servlet.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** mainDispatcher-servlet.xml 14 May 2008 15:23:05 -0000 1.20 --- mainDispatcher-servlet.xml 18 Jun 2009 13:24:06 -0000 1.21 *************** *** 23,26 **** --- 23,27 ---- <prop key="/register">urlFilenameController</prop> <prop key="/version.htm">urlFilenameController</prop> + <prop key="/bugs.htm">urlFilenameController</prop> </props> </property> |
From: Jose C. <jos...@us...> - 2009-06-18 13:24:49
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/classes In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21176/src/main/webapp/WEB-INF/classes Modified Files: portal.properties messages.properties Log Message: Page listing bug fixes/enhancements done on the current version of the data portal. Index: messages.properties =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/classes/messages.properties,v retrieving revision 1.266 retrieving revision 1.267 diff -C2 -d -r1.266 -r1.267 *** messages.properties 27 May 2009 09:40:05 -0000 1.266 --- messages.properties 18 Jun 2009 13:24:05 -0000 1.267 *************** *** 46,50 **** version=Version version.features=New features in this version ! bug.fixes=Bugs fixed in this new version # Accessibility --- 46,51 ---- version=Version version.features=New features in this version ! bugs=Bugs fixed ! bugs.fixes=Bugs fixes / enhancements in this version # Accessibility Index: portal.properties =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/classes/portal.properties,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** portal.properties 24 Feb 2009 15:38:52 -0000 1.25 --- portal.properties 18 Jun 2009 13:24:05 -0000 1.26 *************** *** 22,26 **** # Portal version (visible within HTML source of front page) ! version=1.2.3 #Redirect for datasharing page --- 22,26 ---- # Portal version (visible within HTML source of front page) ! version=1.2.4 #Redirect for datasharing page |
From: Jose C. <jos...@us...> - 2009-06-18 13:24:09
|
Update of /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21176/src/main/webapp/WEB-INF/jsp Modified Files: version.jsp Added Files: bugs.jsp bugsSubtitle.jsp Log Message: Page listing bug fixes/enhancements done on the current version of the data portal. --- NEW FILE: bugsSubtitle.jsp --- <%@ include file="/common/taglibs.jsp"%><spring:message code="version"/> <gbif:propertyLoader bundle="portal" property="version"/> - <spring:message code="bugs.fixes"/> --- NEW FILE: bugs.jsp --- <%@ include file="/common/taglibs.jsp"%> <div id="twopartheader"> <h2><spring:message code="version"/> <gbif:propertyLoader bundle="portal" property="version"/></h2> <h3><spring:message code="bugs.fixes"/></h3> </div> <ul class="genericList"> <li>Species pages - In "Explore All Occurrences," on each species page, the expected number of records is given -- <a href="${pageContext.request.contextPath}/species/13140809">SAMPLE</a></li> <li>Occurrence search - Countries sorted by their name instead of their ISO Code -- <a href="${pageContext.request.contextPath}/occurrences/searchCountries.htm?c[0].s=0&c[0].p=0&c[0].o=Inga vera">SAMPLE</a></li> <li>Data Provider/Dataset pages - Formatted links into real links (a href...) in metadata fields (rights, description) -- <a href="${pageContext.request.contextPath}/datasets/provider/41">SAMPLE</a></li> <li>Country pages - Table included - "Countries providing data for Map" -- <a href="${pageContext.request.contextPath}/countries/AR">SAMPLE</a></li> <li>Dataset individual page - Consolidate content and display of citation texts -- <a href="${pageContext.request.contextPath}/datasets/resource/461">SAMPLE</a></li> <li>Occurrence search - Sort datasets by their name when specifying two filters in occurrence search -- <a href="${pageContext.request.contextPath}/occurrences/searchResources.htm?c[0].s=0&c[0].p=0&c[0].o=Inga vera&c[1].s=32&c[1].p=0&c[1].o=US">SAMPLE</a></li> <li>Occurrence search - Sort providers by their name when specifying two filters in occurrence search -- <a href="${pageContext.request.contextPath}/occurrences/searchProviders.htm?c[0].s=0&c[0].p=0&c[0].o=Inga vera&c[1].s=32&c[1].p=0&c[1].o=US">SAMPLE</a></li> <li>Occurrence Search - Fixed inclusion of recognised synonyms -- <a href="${pageContext.request.contextPath}/occurrences/search.htm?c[0].s=0&c[0].p=0&c[0].o=Felis+concolor">SAMPLE</a></li> <li>Occurrence Search - Added image filter (filters were re-arranged into categories) -- <a href="${pageContext.request.contextPath}/occurrences/">SAMPLE</a></li> <li>Occurrence search - Fixed "Occurrence Date" filter. Date string was not updating automatically -- <a href="${pageContext.request.contextPath}/occurrences/">SAMPLE</a></li> <li>Country page - Fixed spelling of "Cote D'ivoire" -- <a href="${pageContext.request.contextPath}/countries/CI">SAMPLE</a></li> <li>Occurrences page - Removed author name when it is redundant -- <a href="${pageContext.request.contextPath}/occurrences/163107166">SAMPLE</a></li> <li>Occurrence niche model generation page - Fixed spelling of "Precipitation of wettest quarter" -- <a href="${pageContext.request.contextPath}/occurrences/setupModel.htm?c[0].s=0&c[0].p=0&c[0].o=Inga vera">SAMPLE</a></li> <li>Occurrences page - Removed word "Year" on the "Date collected" field -- <a href="{pageContext.request.contextPath}/occurrences/163107166">SAMPLE</a></li> <li>Occurrences page - Removed "interpreted as" when it is redundant for field "Continent" -- <a href="{pageContext.request.contextPath}/occurrences/163107166">SAMPLE</a></li> <li>Dataset page - Non-active access points were removed -- <a href="{pageContext.request.contextPath}/datasets/resource/2023">SAMPLE</a></li> <li>General fixes to memory related problems</li> </ul> Index: version.jsp =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/webapp/WEB-INF/jsp/version.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** version.jsp 24 Feb 2009 15:38:51 -0000 1.4 --- version.jsp 18 Jun 2009 13:24:05 -0000 1.5 *************** *** 5,9 **** </div> <ul class="genericList"> ! <li><a href="${pageContext.request.contextPath}/ws/">Web Services Performance Improvement</a> - response times have been lowered considerably</li> <li><a href="${pageContext.request.contextPath}/occurrences/search.htm?c[0].s=36&c[0].p=0&c[0].o=6788">World Database on Protected Areas (WDPA) now covering all areas</a></li> <li><a href="${pageContext.request.contextPath}/occurrences/">Country filter for Protected Areas</a></li> --- 5,17 ---- </div> <ul class="genericList"> ! <li><a href="${pageContext.request.contextPath}/occurrences/search.htm?c[0].s=0&c[0].p=0&c[0].o=Desmidium+swartzii&c[1].s=37&c[1].p=0&c[1].o=0">Image filter for Occurrence search</a> - Occurrence search now includes searching for records with images</li> ! <li><a href="${pageContext.request.contextPath}/countries/AR">Data statistics on Countries' pages</a> - New statistics on host countries providing georeferenced records for other countries</li> ! <li>Several GUI enhancements</li> ! </ul> ! <a href="${pageContext.request.contextPath}/bugs.htm">Click here</a> for a complete list of fixes/enhancements in this version ! ! <h4>Features added in version 1.2.3</h4> ! <ul class="genericList"> ! <li><a href="${pageContext.request.contextPath}/ws/">Web Services performance improvement</a> - response times have been lowered considerably</li> <li><a href="${pageContext.request.contextPath}/occurrences/search.htm?c[0].s=36&c[0].p=0&c[0].o=6788">World Database on Protected Areas (WDPA) now covering all areas</a></li> <li><a href="${pageContext.request.contextPath}/occurrences/">Country filter for Protected Areas</a></li> |
From: Jose C. <jos...@us...> - 2009-06-15 08:30:51
|
Update of /cvsroot/gbif/portal-web/src/main/java/org/gbif/portal/web/content/taxonomy In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17441/src/main/java/org/gbif/portal/web/content/taxonomy Modified Files: ScientificNameFilterHelper.java Log Message: FIX BUG 328: Occurrence Search - Fixed inclusion of recognised synonyms Index: ScientificNameFilterHelper.java =================================================================== RCS file: /cvsroot/gbif/portal-web/src/main/java/org/gbif/portal/web/content/taxonomy/ScientificNameFilterHelper.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** ScientificNameFilterHelper.java 13 Mar 2008 08:12:44 -0000 1.17 --- ScientificNameFilterHelper.java 15 Jun 2009 08:30:08 -0000 1.18 *************** *** 132,135 **** --- 132,142 ---- } triplets.add(psDTO); + + //if the taxon is not from nub provider, search for its speciesConceptKey also + //(i.e.: search for Felis concolor returns records for Felis concolor and Puma Concolor + if(concept.getSpeciesConceptKey()!=null && !concept.getKey().equals(concept.getSpeciesConceptKey())) { + PropertyStoreTripletDTO psDTO2 = new PropertyStoreTripletDTO(scientificNameTriplet.getNamespace(), tripletSubject, equalsPredicate, new Long(concept.getSpeciesConceptKey())); + triplets.add(psDTO2); + } } } |
From: Tim <tim...@us...> - 2009-05-31 09:49:57
|
Update of /cvsroot/gbif/portal-index/src/main/resources/org/gbif/portal/util/propertystore/dwca_meta_1_0 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv725/src/main/resources/org/gbif/portal/util/propertystore/dwca_meta_1_0 Modified Files: applicationContext-namespaceDefinition.xml Log Message: Incorrect name for WF Index: applicationContext-namespaceDefinition.xml =================================================================== RCS file: /cvsroot/gbif/portal-index/src/main/resources/org/gbif/portal/util/propertystore/dwca_meta_1_0/applicationContext-namespaceDefinition.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** applicationContext-namespaceDefinition.xml 12 May 2009 11:49:14 -0000 1.1 --- applicationContext-namespaceDefinition.xml 31 May 2009 09:49:46 -0000 1.2 *************** *** 19,23 **** <map> <!-- The harvesting workflow --> ! <entry key="RESOURCE.ACCESS.POINT.HARVESTER.WORKFLOW" value-ref="DWC-TA:1.0:harvester"/> </map> </property> --- 19,23 ---- <map> <!-- The harvesting workflow --> ! <entry key="RESOURCE.ACCESS.POINT.HARVESTER.WORKFLOW" value-ref="DWC-TA-META:1.0:harvester"/> </map> </property> *************** *** 27,31 **** Not making heavy use of the workflow and logic encapsulated in the activity itself --> ! <bean id="DWC-TA:1.0:harvester" parent="abstractWorkflow"> <property name="activities"> <list> --- 27,31 ---- Not making heavy use of the workflow and logic encapsulated in the activity itself --> ! <bean id="DWC-TA-META:1.0:harvester" parent="abstractWorkflow"> <property name="activities"> <list> |
From: Jose C. <jos...@us...> - 2009-05-29 21:33:39
|
Update of /cvsroot/gbif/portal-service/src/main/java/org/gbif/portal/dao/geospatial/impl/hibernate In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17457/src/main/java/org/gbif/portal/dao/geospatial/impl/hibernate Modified Files: CountryDAOImpl.java Log Message: small fix on getCountryCountsForCountry() query statement. Index: CountryDAOImpl.java =================================================================== RCS file: /cvsroot/gbif/portal-service/src/main/java/org/gbif/portal/dao/geospatial/impl/hibernate/CountryDAOImpl.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** CountryDAOImpl.java 26 May 2009 10:20:59 -0000 1.24 --- CountryDAOImpl.java 29 May 2009 21:33:04 -0000 1.25 *************** *** 241,249 **** } if(isoCountryCode!=null){ ! sb.append("rc.iso_country_code=:isoCountryCode and cn.locale=:locale"); } if(geoRefOnly){ ! sb.append(" rc.occurrence_coordinate_count>0"); } --- 241,249 ---- } if(isoCountryCode!=null){ ! sb.append(" rc.iso_country_code=:isoCountryCode and cn.locale=:locale"); } if(geoRefOnly){ ! sb.append(" and rc.occurrence_coordinate_count>0"); } |
From: Tim <tim...@us...> - 2009-05-28 13:16:48
|
Update of /cvsroot/gbif/portal-core/db In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3568/db Modified Files: portal.ddl Log Message: removed the incorrect autoincrement starts Index: portal.ddl =================================================================== RCS file: /cvsroot/gbif/portal-core/db/portal.ddl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** portal.ddl 26 May 2009 13:39:41 -0000 1.1 --- portal.ddl 28 May 2009 12:14:05 -0000 1.2 *************** *** 245,249 **** `deleted` datetime default NULL, PRIMARY KEY (`id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=2299 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 245,249 ---- `deleted` datetime default NULL, PRIMARY KEY (`id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 267,271 **** KEY `ix_bi_relation_tag_tag_id_to_entity_id` (`tag_id`,`to_entity_id`), KEY `ix_bi_relation_tag_tag_id_from_entity_id` (`tag_id`,`from_entity_id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=46042440 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 267,271 ---- KEY `ix_bi_relation_tag_tag_id_to_entity_id` (`tag_id`,`to_entity_id`), KEY `ix_bi_relation_tag_tag_id_from_entity_id` (`tag_id`,`from_entity_id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 300,304 **** PRIMARY KEY (`id`), KEY `ix_cn_catalogue_number` (`code`) ! ) ENGINE=MyISAM AUTO_INCREMENT=119508347 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 300,304 ---- PRIMARY KEY (`id`), KEY `ix_cn_catalogue_number` (`code`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 390,394 **** PRIMARY KEY (`id`), KEY `ix_cc_collection_code` (`code`) ! ) ENGINE=MyISAM AUTO_INCREMENT=1525995 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 390,394 ---- PRIMARY KEY (`id`), KEY `ix_cc_collection_code` (`code`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 411,415 **** KEY `IX_common_name_2` (`iso_language_code`), KEY `IX_common_name_3` (`language`) ! ) ENGINE=MyISAM AUTO_INCREMENT=554596 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 411,415 ---- KEY `IX_common_name_2` (`iso_language_code`), KEY `IX_common_name_3` (`language`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 438,442 **** KEY `IX_country_continent_code` (`continent_code`), KEY `IX_country_region` (`region`) ! ) ENGINE=MyISAM AUTO_INCREMENT=246 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 438,442 ---- KEY `IX_country_continent_code` (`continent_code`), KEY `IX_country_region` (`region`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 461,465 **** KEY `IX_country_name_iso_country_code` (`iso_country_code`), KEY `IX_country_name_locale` (`locale`) ! ) ENGINE=MyISAM AUTO_INCREMENT=2655 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 461,465 ---- KEY `IX_country_name_iso_country_code` (`iso_country_code`), KEY `IX_country_name_locale` (`locale`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 501,505 **** KEY `IX_data_provider_name` (`name`), KEY `IX_data_provider_country` (`iso_country_code`) ! ) ENGINE=MyISAM AUTO_INCREMENT=298 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 501,505 ---- KEY `IX_data_provider_name` (`name`), KEY `IX_data_provider_country` (`iso_country_code`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 519,523 **** KEY `data_provider_id` (`data_provider_id`), KEY `agent_id` (`agent_id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=1362 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 519,523 ---- KEY `data_provider_id` (`data_provider_id`), KEY `agent_id` (`agent_id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 566,570 **** KEY `IX_data_resource_display_name` (`display_name`), KEY `IX_data_resource_shared_taxonomy` (`shared_taxonomy`) ! ) ENGINE=MyISAM AUTO_INCREMENT=8286 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 566,570 ---- KEY `IX_data_resource_display_name` (`display_name`), KEY `IX_data_resource_shared_taxonomy` (`shared_taxonomy`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 584,588 **** KEY `data_resource_id` (`data_resource_id`), KEY `agent_id` (`agent_id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=4204 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 584,588 ---- KEY `data_resource_id` (`data_resource_id`), KEY `agent_id` (`agent_id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 634,638 **** KEY `data_provider_id` (`data_provider_id`,`event_id`,`timestamp`), KEY `occurrence_id` (`occurrence_id`,`event_id`,`timestamp`) ! ) ENGINE=MyISAM AUTO_INCREMENT=180674226 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 634,638 ---- KEY `data_provider_id` (`data_provider_id`,`event_id`,`timestamp`), KEY `occurrence_id` (`occurrence_id`,`event_id`,`timestamp`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 652,656 **** PRIMARY KEY (`id`), KEY `IX_gbif_user_verified` (`verified`) ! ) ENGINE=MyISAM AUTO_INCREMENT=682 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 652,656 ---- PRIMARY KEY (`id`), KEY `IX_gbif_user_verified` (`verified`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 713,717 **** PRIMARY KEY (`id`), KEY `tag_id` (`tag_id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=36846 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 713,717 ---- PRIMARY KEY (`id`), KEY `tag_id` (`tag_id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 731,735 **** PRIMARY KEY (`id`), KEY `ix_identifier_record_occurrence` (`occurrence_id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=138807817 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 731,735 ---- PRIMARY KEY (`id`), KEY `ix_identifier_record_occurrence` (`occurrence_id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 756,760 **** KEY `ix_image_record_resource_taxon_concept` (`data_resource_id`,`taxon_concept_id`), KEY `ix_image_record_taxon_concept_id` (`taxon_concept_id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=20711647 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 756,760 ---- KEY `ix_image_record_resource_taxon_concept` (`data_resource_id`,`taxon_concept_id`), KEY `ix_image_record_taxon_concept_id` (`taxon_concept_id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 777,781 **** KEY `IX_indexing_data_1` (`resource_access_point_id`), KEY `IX_indexing_data_2` (`started`) ! ) ENGINE=MyISAM AUTO_INCREMENT=2198954 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 777,781 ---- KEY `IX_indexing_data_1` (`resource_access_point_id`), KEY `IX_indexing_data_2` (`started`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 792,796 **** PRIMARY KEY (`id`), KEY `ix_ic_institution_code` (`code`) ! ) ENGINE=MyISAM AUTO_INCREMENT=29816 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 792,796 ---- PRIMARY KEY (`id`), KEY `ix_ic_institution_code` (`code`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 811,815 **** PRIMARY KEY (`id`), KEY `IX_ip_country_range` (`start_long`,`end_long`) ! ) ENGINE=MyISAM AUTO_INCREMENT=140426 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 811,815 ---- PRIMARY KEY (`id`), KEY `IX_ip_country_range` (`start_long`,`end_long`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 833,837 **** KEY `ix_link_record_occurrence` (`occurrence_id`), KEY `ix_link_record_taxon_concept` (`taxon_concept_id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=2331693 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 833,837 ---- KEY `ix_link_record_occurrence` (`occurrence_id`), KEY `ix_link_record_taxon_concept` (`taxon_concept_id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 972,976 **** KEY `resource_network_id` (`resource_network_id`), KEY `IX_network_membership_id` (`id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=45406 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 972,976 ---- KEY `resource_network_id` (`resource_network_id`), KEY `IX_network_membership_id` (`id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 990,994 **** PRIMARY KEY (`id`), KEY `tag_id` (`tag_id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=109023 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 990,994 ---- PRIMARY KEY (`id`), KEY `tag_id` (`tag_id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 1071,1075 **** `namespace` varchar(255) default NULL, PRIMARY KEY (`id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=15 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 1071,1075 ---- `namespace` varchar(255) default NULL, PRIMARY KEY (`id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 1092,1096 **** PRIMARY KEY (`id`), KEY `entity1_id` (`entity1_id`,`entity2_id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=239093 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 1092,1096 ---- PRIMARY KEY (`id`), KEY `entity1_id` (`entity1_id`,`entity2_id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 1165,1169 **** KEY `data_resource_id` (`data_resource_id`,`catalogue_number`), KEY `resource_access_point_id` (`resource_access_point_id`,`id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=203827066 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 1165,1169 ---- KEY `data_resource_id` (`data_resource_id`,`catalogue_number`), KEY `resource_access_point_id` (`resource_access_point_id`,`id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 1182,1186 **** KEY `IX_registration_login_login_id` (`login_id`), KEY `IX_registration_login_business_key` (`business_key`) ! ) ENGINE=MyISAM AUTO_INCREMENT=10 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 1182,1186 ---- KEY `IX_registration_login_login_id` (`login_id`), KEY `IX_registration_login_business_key` (`business_key`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 1219,1223 **** KEY `ix_remote_concept_remote_id` (`remote_id`), KEY `ix_remote_concept_tc_id` (`taxon_concept_id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=16438217 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 1219,1223 ---- KEY `ix_remote_concept_remote_id` (`remote_id`), KEY `ix_remote_concept_tc_id` (`taxon_concept_id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 1247,1251 **** KEY `data_provider_id` (`data_provider_id`), KEY `ix_rap_dr` (`data_resource_id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=8541 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 1247,1251 ---- KEY `data_provider_id` (`data_provider_id`), KEY `ix_rap_dr` (`data_resource_id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 1295,1299 **** PRIMARY KEY (`id`), KEY `IX_resource_network_name` (`name`) ! ) ENGINE=MyISAM AUTO_INCREMENT=50 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 1295,1299 ---- PRIMARY KEY (`id`), KEY `IX_resource_network_name` (`name`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 1330,1334 **** `rollover_date` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, PRIMARY KEY (`id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=10 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 1330,1334 ---- `rollover_date` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, PRIMARY KEY (`id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 1350,1354 **** `created` datetime default NULL, PRIMARY KEY (`id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=119 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 1350,1354 ---- `created` datetime default NULL, PRIMARY KEY (`id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 1370,1374 **** `created` datetime default NULL, PRIMARY KEY (`id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=196 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 1370,1374 ---- `created` datetime default NULL, PRIMARY KEY (`id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 1388,1392 **** PRIMARY KEY (`id`), KEY `tag_id` (`tag_id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=2991610 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 1388,1392 ---- PRIMARY KEY (`id`), KEY `tag_id` (`tag_id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 1405,1409 **** `description` varchar(255) default NULL, PRIMARY KEY (`id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=6001 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 1405,1409 ---- `description` varchar(255) default NULL, PRIMARY KEY (`id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 1451,1455 **** KEY `ix_taxon_concept_dp` (`data_provider_id`), KEY `ix_taxon_concept_dp_rank` (`data_provider_id`,`rank`) ! ) ENGINE=MyISAM AUTO_INCREMENT=21661178 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 1451,1455 ---- KEY `ix_taxon_concept_dp` (`data_provider_id`), KEY `ix_taxon_concept_dp_rank` (`data_provider_id`,`rank`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 1495,1499 **** KEY `ix_taxon_name_searchable_canonical_rank` (`searchable_canonical`,`rank`), KEY `IX_taxon_name_specific_epithet` (`specific_epithet`) ! ) ENGINE=MyISAM AUTO_INCREMENT=10797249 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 1495,1499 ---- KEY `ix_taxon_name_searchable_canonical_rank` (`searchable_canonical`,`rank`), KEY `IX_taxon_name_specific_epithet` (`specific_epithet`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 1514,1518 **** PRIMARY KEY (`id`), KEY `id` (`id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=36845 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 1514,1518 ---- PRIMARY KEY (`id`), KEY `id` (`id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; *************** *** 1537,1541 **** KEY `ix_typification_record_name` (`taxon_name_id`), KEY `ix_typification_record_resource` (`data_resource_id`) ! ) ENGINE=MyISAM AUTO_INCREMENT=1481631 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; --- 1537,1541 ---- KEY `ix_typification_record_name` (`taxon_name_id`), KEY `ix_typification_record_resource` (`data_resource_id`) ! ) ENGINE=MyISAM DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; |
From: Tim <tim...@us...> - 2009-05-28 12:46:17
|
Update of /cvsroot/gbif/portal-core/db In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8990/db Modified Files: portal.ddl Log Message: publication is a text Index: portal.ddl =================================================================== RCS file: /cvsroot/gbif/portal-core/db/portal.ddl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** portal.ddl 28 May 2009 12:14:05 -0000 1.2 --- portal.ddl 28 May 2009 12:46:09 -0000 1.3 *************** *** 1530,1534 **** `taxon_name_id` mediumint(8) unsigned default NULL, `scientific_name` varchar(255) default NULL, ! `publication` varchar(255) default NULL, `type_status` varchar(255) NOT NULL, `notes` text, --- 1530,1534 ---- `taxon_name_id` mediumint(8) unsigned default NULL, `scientific_name` varchar(255) default NULL, ! `publication` text default NULL, `type_status` varchar(255) NOT NULL, `notes` text, |
From: Tim <tim...@us...> - 2009-05-28 09:19:11
|
Update of /cvsroot/gbif/portal-index/src/main/resources/org/gbif/portal/util/propertystore/gbif_indexing_1_0 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7966/src/main/resources/org/gbif/portal/util/propertystore/gbif_indexing_1_0 Modified Files: applicationContext-namespaceDefinition.xml Log Message: 2 issues addressed 1) Date handling on the DwC 1.4 was not being parsed properly 2) DataSource is now injected and not assumed to be "dataSource" by name in Spring Context Index: applicationContext-namespaceDefinition.xml =================================================================== RCS file: /cvsroot/gbif/portal-index/src/main/resources/org/gbif/portal/util/propertystore/gbif_indexing_1_0/applicationContext-namespaceDefinition.xml,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** applicationContext-namespaceDefinition.xml 16 Jul 2008 12:57:44 -0000 1.28 --- applicationContext-namespaceDefinition.xml 28 May 2009 09:19:01 -0000 1.29 *************** *** 267,274 **** If I set it at the beginning, and break off half way... then it would not pick them up ever --> <!--bean parent="abstractStartExtractActivity"/--> ! <bean class="org.gbif.portal.harvest.workflow.activity.tag.CollectorTagActivity"/> ! <bean class="org.gbif.portal.harvest.workflow.activity.tag.CommonNameTagActivity"/> ! <bean class="org.gbif.portal.harvest.workflow.activity.tag.TaxonomicCoverageTagActivity"/> ! <bean class="org.gbif.portal.harvest.workflow.activity.tag.PolygonTagActivity"/> <!-- log end of extraction event --> <ref bean="extractEndLog"/> --- 267,282 ---- If I set it at the beginning, and break off half way... then it would not pick them up ever --> <!--bean parent="abstractStartExtractActivity"/--> ! <bean class="org.gbif.portal.harvest.workflow.activity.tag.CollectorTagActivity"> ! <property name="dataSource" ref="dataSource"/> ! </bean> ! <bean class="org.gbif.portal.harvest.workflow.activity.tag.CommonNameTagActivity"> ! <property name="dataSource" ref="dataSource"/> ! </bean> ! <bean class="org.gbif.portal.harvest.workflow.activity.tag.TaxonomicCoverageTagActivity"> ! <property name="dataSource" ref="dataSource"/> ! </bean> ! <bean class="org.gbif.portal.harvest.workflow.activity.tag.PolygonTagActivity"> ! <property name="dataSource" ref="dataSource"/> ! </bean> <!-- log end of extraction event --> <ref bean="extractEndLog"/> |
From: Tim <tim...@us...> - 2009-05-28 09:19:10
|
Update of /cvsroot/gbif/portal-index/src/main/resources/org/gbif/portal/util/propertystore/dwc_1_4 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7966/src/main/resources/org/gbif/portal/util/propertystore/dwc_1_4 Modified Files: applicationContext-namespaceDefinition.xml Log Message: 2 issues addressed 1) Date handling on the DwC 1.4 was not being parsed properly 2) DataSource is now injected and not assumed to be "dataSource" by name in Spring Context Index: applicationContext-namespaceDefinition.xml =================================================================== RCS file: /cvsroot/gbif/portal-index/src/main/resources/org/gbif/portal/util/propertystore/dwc_1_4/applicationContext-namespaceDefinition.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** applicationContext-namespaceDefinition.xml 24 Feb 2009 16:18:23 -0000 1.12 --- applicationContext-namespaceDefinition.xml 28 May 2009 09:19:01 -0000 1.13 *************** *** 345,349 **** <entry key="RECORD.GEOSPATIAL.LOCALITY" value="locality"/> <entry key="RECORD.COLLECTOR" value="collectorName"/> ! <entry key="RECORD.TEMPORAL.DATE" value="year"/> <entry key="RECORD.BASIS.OF.RECORD" value="basisOfRecord"/> <entry key="RECORD.IMAGES" value="images"/> --- 345,349 ---- <entry key="RECORD.GEOSPATIAL.LOCALITY" value="locality"/> <entry key="RECORD.COLLECTOR" value="collectorName"/> ! <entry key="RECORD.TEMPORAL.DATE" value="date"/> <entry key="RECORD.BASIS.OF.RECORD" value="basisOfRecord"/> <entry key="RECORD.IMAGES" value="images"/> *************** *** 360,363 **** --- 360,365 ---- </bean> <!--bean parent="abstractRawOccurrenceRecordCreatorActivity"/--> + <!-- Process the date string --> + <bean parent="abstractParseDateToContextActivity"/> <bean parent="abstractRawOccurrenceRecordSynchroniserActivity"/> <!-- Batch persist them all --> |
From: Tim <tim...@us...> - 2009-05-28 09:19:10
|
Update of /cvsroot/gbif/portal-index/src/main/java/org/gbif/portal/harvest/workflow/activity/tag In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7966/src/main/java/org/gbif/portal/harvest/workflow/activity/tag Modified Files: TaxonomicCoverageTagActivity.java CollectorTagActivity.java CommonNameTagActivity.java PolygonTagActivity.java BaseTagActivity.java Log Message: 2 issues addressed 1) Date handling on the DwC 1.4 was not being parsed properly 2) DataSource is now injected and not assumed to be "dataSource" by name in Spring Context Index: TaxonomicCoverageTagActivity.java =================================================================== RCS file: /cvsroot/gbif/portal-index/src/main/java/org/gbif/portal/harvest/workflow/activity/tag/TaxonomicCoverageTagActivity.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TaxonomicCoverageTagActivity.java 16 Jul 2008 12:36:15 -0000 1.1 --- TaxonomicCoverageTagActivity.java 28 May 2009 09:19:01 -0000 1.2 *************** *** 51,55 **** throw new ContextCorruptException("No data resource id in context"); } - DataSource dataSource = (DataSource) this.applicationContext.getBean("dataSource"); JdbcTemplate template = new JdbcTemplate(dataSource); Connection conn = dataSource.getConnection(); --- 51,54 ---- Index: BaseTagActivity.java =================================================================== RCS file: /cvsroot/gbif/portal-index/src/main/java/org/gbif/portal/harvest/workflow/activity/tag/BaseTagActivity.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BaseTagActivity.java 16 Jul 2008 12:36:15 -0000 1.1 --- BaseTagActivity.java 28 May 2009 09:19:01 -0000 1.2 *************** *** 15,18 **** --- 15,20 ---- package org.gbif.portal.harvest.workflow.activity.tag; + import javax.sql.DataSource; + import org.gbif.portal.util.workflow.BaseActivity; import org.gbif.portal.util.workflow.MapContext; *************** *** 28,31 **** --- 30,36 ---- protected String contextKeyDataResourceId = "dataResourceId"; + // allows for overriding the name when multiple datasources are in use + DataSource dataSource; + /** * Should be overridden *************** *** 74,76 **** --- 79,91 ---- System.out.println(this.getClass().getName() +" <data-resource-id>"); } + + protected DataSource getDataSource() { + return dataSource; + } + + public void setDataSource(DataSource dataSource) { + this.dataSource = dataSource; + } + + } \ No newline at end of file Index: PolygonTagActivity.java =================================================================== RCS file: /cvsroot/gbif/portal-index/src/main/java/org/gbif/portal/harvest/workflow/activity/tag/PolygonTagActivity.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PolygonTagActivity.java 16 Jul 2008 12:36:15 -0000 1.1 --- PolygonTagActivity.java 28 May 2009 09:19:01 -0000 1.2 *************** *** 57,61 **** throw new ContextCorruptException("No data resource id in context"); } - DataSource dataSource = (DataSource) this.applicationContext.getBean("dataSource"); JdbcTemplate template = new JdbcTemplate(dataSource); Connection conn = dataSource.getConnection(); --- 57,60 ---- Index: CommonNameTagActivity.java =================================================================== RCS file: /cvsroot/gbif/portal-index/src/main/java/org/gbif/portal/harvest/workflow/activity/tag/CommonNameTagActivity.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CommonNameTagActivity.java 16 Jul 2008 12:36:15 -0000 1.1 --- CommonNameTagActivity.java 28 May 2009 09:19:01 -0000 1.2 *************** *** 49,53 **** } - DataSource dataSource = (DataSource) this.applicationContext.getBean("dataSource"); JdbcTemplate template = new JdbcTemplate(dataSource); Connection conn = dataSource.getConnection(); --- 49,52 ---- Index: CollectorTagActivity.java =================================================================== RCS file: /cvsroot/gbif/portal-index/src/main/java/org/gbif/portal/harvest/workflow/activity/tag/CollectorTagActivity.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CollectorTagActivity.java 16 Jul 2008 12:36:15 -0000 1.1 --- CollectorTagActivity.java 28 May 2009 09:19:01 -0000 1.2 *************** *** 51,55 **** throw new ContextCorruptException("No data resource id in context"); } - DataSource dataSource = (DataSource) this.applicationContext.getBean("dataSource"); JdbcTemplate template = new JdbcTemplate(dataSource); Connection conn = dataSource.getConnection(); --- 51,54 ---- |
From: Tim <tim...@us...> - 2009-05-28 09:19:10
|
Update of /cvsroot/gbif/portal-index/src/main/java/org/gbif/portal/harvest/workflow/activity In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7966/src/main/java/org/gbif/portal/harvest/workflow/activity Modified Files: ParseDateToContextActivity.java Log Message: 2 issues addressed 1) Date handling on the DwC 1.4 was not being parsed properly 2) DataSource is now injected and not assumed to be "dataSource" by name in Spring Context Index: ParseDateToContextActivity.java =================================================================== RCS file: /cvsroot/gbif/portal-index/src/main/java/org/gbif/portal/harvest/workflow/activity/ParseDateToContextActivity.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ParseDateToContextActivity.java 7 Feb 2007 12:02:22 -0000 1.2 --- ParseDateToContextActivity.java 28 May 2009 09:19:01 -0000 1.3 *************** *** 9,12 **** --- 9,13 ---- import org.gbif.portal.util.workflow.BaseActivity; + import org.gbif.portal.util.workflow.MapContext; import org.gbif.portal.util.workflow.ProcessContext; *************** *** 22,41 **** * The key for the date to extract from */ ! protected String contextKeyDate; /** * The key for the year to insert into the context */ ! protected String contextKeyYear; /** * The key for the month to insert into the context */ ! protected String contextKeyMonth; /** * The key for the day to insert into the context */ ! protected String contextKeyDay; /** --- 23,42 ---- * The key for the date to extract from */ ! protected String contextKeyDate = "date"; /** * The key for the year to insert into the context */ ! protected String contextKeyYear = "year"; /** * The key for the month to insert into the context */ ! protected String contextKeyMonth = "month"; /** * The key for the day to insert into the context */ ! protected String contextKeyDay = "day"; /** *************** *** 114,117 **** --- 115,131 ---- } + @SuppressWarnings("unchecked") + public static void main(String[] args) { + ProcessContext context = new MapContext(); + context.put("year", "1980-03-07"); + ParseDateToContextActivity me = new ParseDateToContextActivity(); + try { + me.execute(context); + System.out.println(context.get("date") + " parsed to (YMD): " + context.get("year") + " / " + context.get("month") + " / " +context.get("day")); + } catch (Exception e) { + e.printStackTrace(); + } + } + /** * @return the contextKeyDate |