Menu
▾
▴
treebase-guts — Commit and tracker messages
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
(1) |
Apr
(14) |
May
(36) |
Jun
(148) |
Jul
(33) |
Aug
(2) |
Sep
(17) |
Oct
(42) |
Nov
(137) |
Dec
(88) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(89) |
Feb
(80) |
Mar
(217) |
Apr
(76) |
May
(5) |
Jun
(39) |
Jul
(35) |
Aug
(4) |
Sep
(7) |
Oct
(14) |
Nov
(12) |
Dec
(9) |
| 2011 |
Jan
(6) |
Feb
(4) |
Mar
(11) |
Apr
(55) |
May
(90) |
Jun
(39) |
Jul
(15) |
Aug
(15) |
Sep
(23) |
Oct
(12) |
Nov
(17) |
Dec
(20) |
| 2012 |
Jan
(22) |
Feb
(63) |
Mar
|
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(3) |
Feb
(6) |
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: SourceForge.net <no...@so...> - 2010-07-23 19:55:38
|
Bugs item #3033740, was opened at 2010-07-23 12:55 Message generated for change (Tracker Item Submitted) made by ksclarke You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3033740&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: data Group: None Status: Open Priority: 5 Private: No Submitted By: Kevin S. Clarke (ksclarke) Assigned to: Mark Dominus (mjdominus) Summary: Some OAI records missing required datestamp element Initial Comment: Some of the records coming out via OAI are missing a required datestamp element in their header. For example: http://www.treebase.org/treebase-web/top/oai?verb=GetRecord&metadataPrefix=oai_dc&identifier=TB:s1236 These records have an empty <datestamp></datestamp> element, but this isn't acceptable according to the UTCdatetimeType defined in the schema. The record, as a result, is not valid and may cause OAI ingesters to choke. Thanks. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3033740&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2010-07-23 19:10:49
|
Bugs item #3032847, was opened at 2010-07-21 19:15 Message generated for change (Comment added) made by sfrgpiel You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3032847&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: data Group: None >Status: Closed Priority: 7 Private: No Submitted By: Kevin S. Clarke (ksclarke) Assigned to: youjun guo (youjun) Summary: OAI provider returns invalid XML for 12 records Initial Comment: Twelve of the oai_dc records returned from the OAI provider are not valid XML because they contain a Unicode character (0x1a) that is invalid for XML. The twelve records are: TreeBASE.org/study/TB2:s955 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1119 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1226 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1641 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1731 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1779 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1816 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1862 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1945 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2028 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2146 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2248 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. Perhaps strip the character before it is returned by the OAI provider? ---------------------------------------------------------------------- >Comment By: William Piel (sfrgpiel) Date: 2010-07-23 15:10 Message: I've edited each record to remove the badly formed characters. This is the result of artifacts created during migration when character sets were not consistent. ---------------------------------------------------------------------- Comment By: Kevin S. Clarke (ksclarke) Date: 2010-07-22 08:08 Message: My mistake... the output in the browser does have the encoding. XOM must strip it if its the default utf8. ---------------------------------------------------------------------- Comment By: youjun guo (youjun) Date: 2010-07-22 07:48 Message: The velocity template I am using to create oai-pmh response in treebase ../vmFiles/head.vm looks like this: every response should include this file at the beginning <?xml version="1.0" encoding="UTF-8"?> <OAI-PMH xmlns="http://www.openarchives.org/OAI/2.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/ http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd"> ---------------------------------------------------------------------- Comment By: Kevin S. Clarke (ksclarke) Date: 2010-07-21 22:40 Message: The XML coming out doesn't have an explicit encoding set: <?xml version="1.0"?> so if the text in the XML isn't UTF-8 that could be the problem... not sure what character set is used in the database. ---------------------------------------------------------------------- Comment By: Hilmar Lapp (hlapp) Date: 2010-07-21 22:17 Message: See also http://www.w3schools.com/XML/xml_encoding.asp ---------------------------------------------------------------------- Comment By: Hilmar Lapp (hlapp) Date: 2010-07-21 22:16 Message: Youjun - are you setting the document encoding expressly to UTF-8? I.e. do you have <?xml version="1.0" encoding="UTF-8"?> as the first line? Also, the encoding the character is in *must* match the encoding given in the <?xml?> line. ---------------------------------------------------------------------- Comment By: youjun guo (youjun) Date: 2010-07-21 21:52 Message: This problem cause by some foreign language letters exist in the Treebase tables especially in table person fields lastname or firestName. We discussed this before. Maybe we need to use some other charset instead of utf-8 ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3032847&group_id=248804 |
|
From: <yo...@us...> - 2010-07-22 16:04:49
|
Revision: 748
http://treebase.svn.sourceforge.net/treebase/?rev=748&view=rev
Author: youjun
Date: 2010-07-22 16:04:41 +0000 (Thu, 22 Jul 2010)
Log Message:
-----------
fix oai-pmh identifier, use the modification date instead of relese data
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/OAIPMHController.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/OAIPMHController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/OAIPMHController.java 2010-07-22 14:03:19 UTC (rev 747)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/OAIPMHController.java 2010-07-22 16:04:41 UTC (rev 748)
@@ -243,8 +243,8 @@
map.put("description",IdentifyUtil.escape4XML(study.getId(),study.getNotes()));
map.put("publisher", IdentifyUtil.escape4XML(study.getId(),publisher));
map.put("date", "published on "+citation.getPublishYear());
- map.put("identifier", "TreeBASE.org/study/TB2:s"+study.getId());
- map.put("datestamp", study.getReleaseDate());
+ map.put("identifier", "purl.org/phylo/treebase/phylows/study/TB2:S"+study.getId());
+ map.put("datestamp", study.getLastModifiedDate());
}catch(Exception e){
//study 253 citation= null, data should be fixed
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2010-07-22 14:03:26
|
Revision: 747
http://treebase.svn.sourceforge.net/treebase/?rev=747&view=rev
Author: youjun
Date: 2010-07-22 14:03:19 +0000 (Thu, 22 Jul 2010)
Log Message:
-----------
getsiteUrl
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 14:58:14 UTC (rev 746)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-22 14:03:19 UTC (rev 747)
@@ -78,9 +78,10 @@
return sw.getBuffer().toString();
}
+ String BASEURL = TreebaseUtil.getSiteUrl();
// apache server re-write the application path to localhost
//String[] baseURL=httpRequest.getRequestURL().toString().split("handshaking");
- String importURL= "BASEURL" + "/login.jsp?importKey=" + systemTime;
+ String importURL= BASEURL + "login.jsp?importKey=" + systemTime;
return importURL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: SourceForge.net <no...@so...> - 2010-07-22 12:08:03
|
Bugs item #3032847, was opened at 2010-07-21 16:15 Message generated for change (Comment added) made by ksclarke You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3032847&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: data Group: None Status: Open Priority: 7 Private: No Submitted By: Kevin S. Clarke (ksclarke) Assigned to: youjun guo (youjun) Summary: OAI provider returns invalid XML for 12 records Initial Comment: Twelve of the oai_dc records returned from the OAI provider are not valid XML because they contain a Unicode character (0x1a) that is invalid for XML. The twelve records are: TreeBASE.org/study/TB2:s955 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1119 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1226 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1641 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1731 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1779 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1816 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1862 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1945 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2028 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2146 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2248 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. Perhaps strip the character before it is returned by the OAI provider? ---------------------------------------------------------------------- >Comment By: Kevin S. Clarke (ksclarke) Date: 2010-07-22 05:08 Message: My mistake... the output in the browser does have the encoding. XOM must strip it if its the default utf8. ---------------------------------------------------------------------- Comment By: youjun guo (youjun) Date: 2010-07-22 04:48 Message: The velocity template I am using to create oai-pmh response in treebase ../vmFiles/head.vm looks like this: every response should include this file at the beginning <?xml version="1.0" encoding="UTF-8"?> <OAI-PMH xmlns="http://www.openarchives.org/OAI/2.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/ http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd"> ---------------------------------------------------------------------- Comment By: Kevin S. Clarke (ksclarke) Date: 2010-07-21 19:40 Message: The XML coming out doesn't have an explicit encoding set: <?xml version="1.0"?> so if the text in the XML isn't UTF-8 that could be the problem... not sure what character set is used in the database. ---------------------------------------------------------------------- Comment By: Hilmar Lapp (hlapp) Date: 2010-07-21 19:17 Message: See also http://www.w3schools.com/XML/xml_encoding.asp ---------------------------------------------------------------------- Comment By: Hilmar Lapp (hlapp) Date: 2010-07-21 19:16 Message: Youjun - are you setting the document encoding expressly to UTF-8? I.e. do you have <?xml version="1.0" encoding="UTF-8"?> as the first line? Also, the encoding the character is in *must* match the encoding given in the <?xml?> line. ---------------------------------------------------------------------- Comment By: youjun guo (youjun) Date: 2010-07-21 18:52 Message: This problem cause by some foreign language letters exist in the Treebase tables especially in table person fields lastname or firestName. We discussed this before. Maybe we need to use some other charset instead of utf-8 ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3032847&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2010-07-22 11:48:47
|
Bugs item #3032847, was opened at 2010-07-21 19:15 Message generated for change (Comment added) made by youjun You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3032847&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: data Group: None Status: Open Priority: 7 Private: No Submitted By: Kevin S. Clarke (ksclarke) Assigned to: youjun guo (youjun) Summary: OAI provider returns invalid XML for 12 records Initial Comment: Twelve of the oai_dc records returned from the OAI provider are not valid XML because they contain a Unicode character (0x1a) that is invalid for XML. The twelve records are: TreeBASE.org/study/TB2:s955 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1119 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1226 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1641 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1731 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1779 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1816 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1862 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1945 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2028 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2146 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2248 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. Perhaps strip the character before it is returned by the OAI provider? ---------------------------------------------------------------------- >Comment By: youjun guo (youjun) Date: 2010-07-22 07:48 Message: The velocity template I am using to create oai-pmh response in treebase ../vmFiles/head.vm looks like this: every response should include this file at the beginning <?xml version="1.0" encoding="UTF-8"?> <OAI-PMH xmlns="http://www.openarchives.org/OAI/2.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/ http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd"> ---------------------------------------------------------------------- Comment By: Kevin S. Clarke (ksclarke) Date: 2010-07-21 22:40 Message: The XML coming out doesn't have an explicit encoding set: <?xml version="1.0"?> so if the text in the XML isn't UTF-8 that could be the problem... not sure what character set is used in the database. ---------------------------------------------------------------------- Comment By: Hilmar Lapp (hlapp) Date: 2010-07-21 22:17 Message: See also http://www.w3schools.com/XML/xml_encoding.asp ---------------------------------------------------------------------- Comment By: Hilmar Lapp (hlapp) Date: 2010-07-21 22:16 Message: Youjun - are you setting the document encoding expressly to UTF-8? I.e. do you have <?xml version="1.0" encoding="UTF-8"?> as the first line? Also, the encoding the character is in *must* match the encoding given in the <?xml?> line. ---------------------------------------------------------------------- Comment By: youjun guo (youjun) Date: 2010-07-21 21:52 Message: This problem cause by some foreign language letters exist in the Treebase tables especially in table person fields lastname or firestName. We discussed this before. Maybe we need to use some other charset instead of utf-8 ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3032847&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2010-07-22 02:52:07
|
Bugs item #3032847, was opened at 2010-07-21 16:15 Message generated for change (Comment added) made by ksclarke You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3032847&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: data Group: None Status: Open Priority: 7 Private: No Submitted By: Kevin S. Clarke (ksclarke) Assigned to: youjun guo (youjun) Summary: OAI provider returns invalid XML for 12 records Initial Comment: Twelve of the oai_dc records returned from the OAI provider are not valid XML because they contain a Unicode character (0x1a) that is invalid for XML. The twelve records are: TreeBASE.org/study/TB2:s955 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1119 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1226 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1641 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1731 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1779 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1816 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1862 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1945 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2028 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2146 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2248 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. Perhaps strip the character before it is returned by the OAI provider? ---------------------------------------------------------------------- >Comment By: Kevin S. Clarke (ksclarke) Date: 2010-07-21 19:40 Message: The XML coming out doesn't have an explicit encoding set: <?xml version="1.0"?> so if the text in the XML isn't UTF-8 that could be the problem... not sure what character set is used in the database. ---------------------------------------------------------------------- Comment By: Hilmar Lapp (hlapp) Date: 2010-07-21 19:17 Message: See also http://www.w3schools.com/XML/xml_encoding.asp ---------------------------------------------------------------------- Comment By: Hilmar Lapp (hlapp) Date: 2010-07-21 19:16 Message: Youjun - are you setting the document encoding expressly to UTF-8? I.e. do you have <?xml version="1.0" encoding="UTF-8"?> as the first line? Also, the encoding the character is in *must* match the encoding given in the <?xml?> line. ---------------------------------------------------------------------- Comment By: youjun guo (youjun) Date: 2010-07-21 18:52 Message: This problem cause by some foreign language letters exist in the Treebase tables especially in table person fields lastname or firestName. We discussed this before. Maybe we need to use some other charset instead of utf-8 ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3032847&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2010-07-22 02:17:44
|
Bugs item #3032847, was opened at 2010-07-21 19:15 Message generated for change (Comment added) made by hlapp You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3032847&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: data Group: None Status: Open Priority: 7 Private: No Submitted By: Kevin S. Clarke (ksclarke) Assigned to: youjun guo (youjun) Summary: OAI provider returns invalid XML for 12 records Initial Comment: Twelve of the oai_dc records returned from the OAI provider are not valid XML because they contain a Unicode character (0x1a) that is invalid for XML. The twelve records are: TreeBASE.org/study/TB2:s955 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1119 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1226 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1641 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1731 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1779 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1816 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1862 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1945 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2028 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2146 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2248 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. Perhaps strip the character before it is returned by the OAI provider? ---------------------------------------------------------------------- >Comment By: Hilmar Lapp (hlapp) Date: 2010-07-21 22:17 Message: See also http://www.w3schools.com/XML/xml_encoding.asp ---------------------------------------------------------------------- Comment By: Hilmar Lapp (hlapp) Date: 2010-07-21 22:16 Message: Youjun - are you setting the document encoding expressly to UTF-8? I.e. do you have <?xml version="1.0" encoding="UTF-8"?> as the first line? Also, the encoding the character is in *must* match the encoding given in the <?xml?> line. ---------------------------------------------------------------------- Comment By: youjun guo (youjun) Date: 2010-07-21 21:52 Message: This problem cause by some foreign language letters exist in the Treebase tables especially in table person fields lastname or firestName. We discussed this before. Maybe we need to use some other charset instead of utf-8 ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3032847&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2010-07-22 02:16:21
|
Bugs item #3032847, was opened at 2010-07-21 19:15 Message generated for change (Comment added) made by hlapp You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3032847&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: data Group: None Status: Open >Priority: 7 Private: No Submitted By: Kevin S. Clarke (ksclarke) >Assigned to: youjun guo (youjun) Summary: OAI provider returns invalid XML for 12 records Initial Comment: Twelve of the oai_dc records returned from the OAI provider are not valid XML because they contain a Unicode character (0x1a) that is invalid for XML. The twelve records are: TreeBASE.org/study/TB2:s955 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1119 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1226 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1641 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1731 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1779 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1816 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1862 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1945 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2028 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2146 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2248 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. Perhaps strip the character before it is returned by the OAI provider? ---------------------------------------------------------------------- >Comment By: Hilmar Lapp (hlapp) Date: 2010-07-21 22:16 Message: Youjun - are you setting the document encoding expressly to UTF-8? I.e. do you have <?xml version="1.0" encoding="UTF-8"?> as the first line? Also, the encoding the character is in *must* match the encoding given in the <?xml?> line. ---------------------------------------------------------------------- Comment By: youjun guo (youjun) Date: 2010-07-21 21:52 Message: This problem cause by some foreign language letters exist in the Treebase tables especially in table person fields lastname or firestName. We discussed this before. Maybe we need to use some other charset instead of utf-8 ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3032847&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2010-07-22 01:52:39
|
Bugs item #3032847, was opened at 2010-07-21 19:15 Message generated for change (Comment added) made by youjun You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3032847&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: data Group: None Status: Open Priority: 5 Private: No Submitted By: Kevin S. Clarke (ksclarke) Assigned to: Mark Dominus (mjdominus) Summary: OAI provider returns invalid XML for 12 records Initial Comment: Twelve of the oai_dc records returned from the OAI provider are not valid XML because they contain a Unicode character (0x1a) that is invalid for XML. The twelve records are: TreeBASE.org/study/TB2:s955 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1119 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1226 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1641 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1731 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1779 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1816 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1862 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1945 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2028 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2146 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2248 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. Perhaps strip the character before it is returned by the OAI provider? ---------------------------------------------------------------------- >Comment By: youjun guo (youjun) Date: 2010-07-21 21:52 Message: This problem cause by some foreign language letters exist in the Treebase tables especially in table person fields lastname or firestName. We discussed this before. Maybe we need to use some other charset instead of utf-8 ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3032847&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2010-07-21 23:15:17
|
Bugs item #3032847, was opened at 2010-07-21 16:15 Message generated for change (Tracker Item Submitted) made by ksclarke You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3032847&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: data Group: None Status: Open Priority: 5 Private: No Submitted By: Kevin S. Clarke (ksclarke) Assigned to: Mark Dominus (mjdominus) Summary: OAI provider returns invalid XML for 12 records Initial Comment: Twelve of the oai_dc records returned from the OAI provider are not valid XML because they contain a Unicode character (0x1a) that is invalid for XML. The twelve records are: TreeBASE.org/study/TB2:s955 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1119 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1226 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1641 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1731 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1779 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1816 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1862 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s1945 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2028 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2146 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. TreeBASE.org/study/TB2:s2248 An invalid XML character (Unicode: 0x1a) was found in the element content of the document. Perhaps strip the character before it is returned by the OAI provider? ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3032847&group_id=248804 |
|
From: <yo...@us...> - 2010-07-21 14:58:20
|
Revision: 746
http://treebase.svn.sourceforge.net/treebase/?rev=746&view=rev
Author: youjun
Date: 2010-07-21 14:58:14 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/DryadUtil.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/DryadUtil.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/DryadUtil.java 2010-07-21 14:45:30 UTC (rev 745)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/DryadUtil.java 2010-07-21 14:58:14 UTC (rev 746)
@@ -29,7 +29,7 @@
File[] nexus = files[i].listFiles(new FilenameFilter() {
public boolean accept(File file, String name) {
- boolean ret = name.endsWith("nexus");
+ boolean ret = (name.endsWith("nexus"));
return ret;
}});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2010-07-21 14:45:36
|
Revision: 745
http://treebase.svn.sourceforge.net/treebase/?rev=745&view=rev
Author: youjun
Date: 2010-07-21 14:45:30 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/DryadUtil.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/DryadUtil.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/DryadUtil.java 2010-07-21 14:08:46 UTC (rev 744)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/DryadUtil.java 2010-07-21 14:45:30 UTC (rev 745)
@@ -29,7 +29,7 @@
File[] nexus = files[i].listFiles(new FilenameFilter() {
public boolean accept(File file, String name) {
- boolean ret = !(name.endsWith("nexus"));
+ boolean ret = name.endsWith("nexus");
return ret;
}});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2010-07-21 14:08:54
|
Revision: 744
http://treebase.svn.sourceforge.net/treebase/?rev=744&view=rev
Author: youjun
Date: 2010-07-21 14:08:46 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
add comment
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 14:06:05 UTC (rev 743)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 14:08:46 UTC (rev 744)
@@ -38,7 +38,8 @@
public String processMultiparts(MultiPart multiPart) {
String ip = httpRequest.getRemoteAddr();
- //if(!AllowIP.isAllowIP(ip))return "client " + ip + " is not authorized";
+ // apache server re-write the ip to 127.0.0.1
+ //if(!AllowIP.isAllowIP(ip))return "client " + ip + " is not authorized";
BodyPartEntity bpe = (BodyPartEntity) multiPart.getBodyParts().get(0).getEntity();
File unzipFold;
@@ -75,7 +76,9 @@
StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw));
return sw.getBuffer().toString();
- }
+ }
+
+ // apache server re-write the application path to localhost
//String[] baseURL=httpRequest.getRequestURL().toString().split("handshaking");
String importURL= "BASEURL" + "/login.jsp?importKey=" + systemTime;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2010-07-21 14:06:14
|
Revision: 743
http://treebase.svn.sourceforge.net/treebase/?rev=743&view=rev
Author: youjun
Date: 2010-07-21 14:06:05 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
apache rewrite the request url to localhost the application path is not working
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 13:45:49 UTC (rev 742)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 14:06:05 UTC (rev 743)
@@ -11,7 +11,6 @@
import com.sun.jersey.multipart.*;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpUtils;
import javax.ws.rs.Consumes;
//import javax.ws.rs.POST;
import javax.ws.rs.PUT;
@@ -77,8 +76,8 @@
e.printStackTrace(new PrintWriter(sw));
return sw.getBuffer().toString();
}
- String[] baseURL=HttpUtils.getRequestURL(httpRequest).toString().split("handshaking");
- String importURL= baseURL[0] + "login.jsp?importKey=" + systemTime;
+ //String[] baseURL=httpRequest.getRequestURL().toString().split("handshaking");
+ String importURL= "BASEURL" + "/login.jsp?importKey=" + systemTime;
return importURL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2010-07-21 13:45:55
|
Revision: 742
http://treebase.svn.sourceforge.net/treebase/?rev=742&view=rev
Author: youjun
Date: 2010-07-21 13:45:49 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 13:15:13 UTC (rev 741)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 13:45:49 UTC (rev 742)
@@ -11,6 +11,7 @@
import com.sun.jersey.multipart.*;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpUtils;
import javax.ws.rs.Consumes;
//import javax.ws.rs.POST;
import javax.ws.rs.PUT;
@@ -76,7 +77,7 @@
e.printStackTrace(new PrintWriter(sw));
return sw.getBuffer().toString();
}
- String[] baseURL=httpRequest.getRequestURL().toString().split("handshaking");
+ String[] baseURL=HttpUtils.getRequestURL(httpRequest).toString().split("handshaking");
String importURL= baseURL[0] + "login.jsp?importKey=" + systemTime;
return importURL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2010-07-21 13:18:52
|
Revision: 741
http://treebase.svn.sourceforge.net/treebase/?rev=741&view=rev
Author: youjun
Date: 2010-07-21 13:15:13 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
treebase request ip is always re-write to 127.0.0.1, ip based authentication will not work
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 12:50:40 UTC (rev 740)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 13:15:13 UTC (rev 741)
@@ -38,7 +38,7 @@
public String processMultiparts(MultiPart multiPart) {
String ip = httpRequest.getRemoteAddr();
- if(!AllowIP.isAllowIP(ip))return "client " + ip + " is not authorized";
+ //if(!AllowIP.isAllowIP(ip))return "client " + ip + " is not authorized";
BodyPartEntity bpe = (BodyPartEntity) multiPart.getBodyParts().get(0).getEntity();
File unzipFold;
@@ -92,7 +92,6 @@
private static final String yale2 = "130.132.27.212";
static boolean isAllowIP(String ip){
-
if (ip.compareTo(dryad1)==0) return true;
if (ip.compareTo(dryad2)==0) return true;
if (ip.compareTo(yale1)==0)return true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2010-07-21 12:50:46
|
Revision: 740
http://treebase.svn.sourceforge.net/treebase/?rev=740&view=rev
Author: youjun
Date: 2010-07-21 12:50:40 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-20 15:12:46 UTC (rev 739)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/webservices/DryadImportor.java 2010-07-21 12:50:40 UTC (rev 740)
@@ -38,7 +38,7 @@
public String processMultiparts(MultiPart multiPart) {
String ip = httpRequest.getRemoteAddr();
- if(!AllowIP.isAllowIP(ip))return "not authorized";
+ if(!AllowIP.isAllowIP(ip))return "client " + ip + " is not authorized";
BodyPartEntity bpe = (BodyPartEntity) multiPart.getBodyParts().get(0).getEntity();
File unzipFold;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: SourceForge.net <no...@so...> - 2010-07-21 03:05:20
|
Bugs item #3032392, was opened at 2010-07-20 23:05 Message generated for change (Tracker Item Submitted) made by sfrgpiel You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3032392&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: data Group: None Status: Open Priority: 6 Private: No Submitted By: William Piel (sfrgpiel) Assigned to: Mark Dominus (mjdominus) Summary: error when viewing taxa for S10507 Initial Comment: Following this URL: http://www.treebase.org/treebase-web/search/study/taxa.html?id=10507 ...results in the message below. If the error can be identified to an identifiable data corruption, let's take note of it and try to locate other instances of this problem. javax.servlet.jsp.JspException: No bean specified at org.displaytag.render.TableWriterTemplate.writeTable(TableWriterTemplate.java:166) at org.displaytag.render.HtmlTableWriter.writeTable(HtmlTableWriter.java:643) at org.displaytag.tags.TableTag.writeHTMLData(TableTag.java:1557) at org.displaytag.tags.TableTag.doEndTag(TableTag.java:1206) at org.apache.jsp.WEB_002dINF.pages.search.study.taxa_jsp._jspService(taxa_jsp.java:185) at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:98) at javax.servlet.http.HttpServlet.service(HttpServlet.java:729) at org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:331) at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:329) at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:265) at javax.servlet.http.HttpServlet.service(HttpServlet.java:729) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:269) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188) at com.opensymphony.module.sitemesh.filter.PageFilter.doFilter(PageFilter.java:39) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188) at org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:679) at org.apache.catalina.core.ApplicationDispatcher.processRequest(ApplicationDispatcher.java:461) at org.apache.catalina.core.ApplicationDispatcher.doForward(ApplicationDispatcher.java:399) at org.apache.catalina.core.ApplicationDispatcher.forward(ApplicationDispatcher.java:301) at org.springframework.web.servlet.view.InternalResourceView.renderMergedOutputModel(InternalResourceView.java:142) at org.springframework.web.servlet.view.AbstractView.render(AbstractView.java:239) at org.springframework.web.servlet.DispatcherServlet.render(DispatcherServlet.java:1142) at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:879) at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:792) at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:476) at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:431) at javax.servlet.http.HttpServlet.service(HttpServlet.java:627) at javax.servlet.http.HttpServlet.service(HttpServlet.java:729) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:269) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188) at org.tuckey.web.filters.urlrewrite.RuleChain.handleRewrite(RuleChain.java:164) at org.tuckey.web.filters.urlrewrite.RuleChain.doRules(RuleChain.java:141) at org.tuckey.web.filters.urlrewrite.UrlRewriter.processRequest(UrlRewriter.java:90) at org.tuckey.web.filters.urlrewrite.UrlRewriteFilter.doFilter(UrlRewriteFilter.java:406) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188) at org.displaytag.filter.ResponseOverrideFilter.doFilter(ResponseOverrideFilter.java:125) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188) at org.springframework.orm.hibernate3.support.OpenSessionInViewFilter.doFilterInternal(OpenSessionInViewFilter.java:198) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:75) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188) at com.opensymphony.module.sitemesh.filter.PageFilter.parsePage(PageFilter.java:119) at com.opensymphony.module.sitemesh.filter.PageFilter.doFilter(PageFilter.java:55) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188) at org.acegisecurity.util.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:264) at org.acegisecurity.intercept.web.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:107) at org.acegisecurity.intercept.web.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:72) at org.acegisecurity.util.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:274) at org.acegisecurity.ui.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:110) at org.acegisecurity.util.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:274) at org.acegisecurity.wrapper.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:81) at org.acegisecurity.util.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:274) at org.acegisecurity.ui.AbstractProcessingFilter.doFilter(AbstractProcessingFilter.java:217) at org.acegisecurity.util.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:274) at org.acegisecurity.context.HttpSessionContextIntegrationFilter.doFilter(HttpSessionContextIntegrationFilter.java:191) at org.acegisecurity.util.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:274) at org.acegisecurity.util.FilterChainProxy.doFilter(FilterChainProxy.java:148) at org.acegisecurity.util.FilterToBeanProxy.doFilter(FilterToBeanProxy.java:90) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:213) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:172) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:127) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:117) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:108) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:174) at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:873) at org.apache.coyote.http11.Http11BaseProtocol$Http11ConnectionHandler.processConnection(Http11BaseProtocol.java:665) at org.apache.tomcat.util.net.PoolTcpEndpoint.processSocket(PoolTcpEndpoint.java:528) at org.apache.tomcat.util.net.LeaderFollowerWorkerThread.runIt(LeaderFollowerWorkerThread.java:81) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:689) at java.lang.Thread.run(Thread.java:636) ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3032392&group_id=248804 |
|
From: <yo...@us...> - 2010-07-20 15:12:52
|
Revision: 739
http://treebase.svn.sourceforge.net/treebase/?rev=739&view=rev
Author: youjun
Date: 2010-07-20 15:12:46 +0000 (Tue, 20 Jul 2010)
Log Message:
-----------
handshaking process nexus
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java 2010-07-16 02:32:08 UTC (rev 738)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java 2010-07-20 15:12:46 UTC (rev 739)
@@ -96,7 +96,7 @@
for(int i=0; i<files.size(); i++ )
submission.getStudy().addNexusFile(files.get(i).getName(), "NEXUS");
MyProgressionListener listener = new MyProgressionListener();
- //getSubmissionService().addNexusFilesJDBC(submission, files, listener);
+ getSubmissionService().addNexusFilesJDBC(submission, files, listener);
// save Study object to session
//mSubmissionService.save(submission);
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java 2010-07-16 02:32:08 UTC (rev 738)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java 2010-07-20 15:12:46 UTC (rev 739)
@@ -61,7 +61,7 @@
if(description!=null)citation.setAbstract(description.getText());
Node identifier = getNode(pubRoot,"identifier",dcterms);
- if(identifier!=null)citation.setDoi(identifier.getText());;
+ if(identifier!=null)citation.setDoi(identifier.getText().replaceAll("doi:", ""));
Node title = getNode(pubRoot,"title",dcterms);
if(title!=null)citation.setTitle(title.getText());
@@ -90,7 +90,13 @@
String []names = al.get(i).getText().split(",");
if(names.length >1 ){
Person p = new Person ();
- p.setFirstName(names[1]);
+ names[1]=names[1].trim();
+ if(!(names[1].contains(" ")))p.setFirstName(names[1]);
+ else {
+
+ p.setFirstName(names[1].trim().substring(0,names[1].indexOf(" ")));
+ p.setMiddleName(names[1].trim().substring(names[1].indexOf(" ")));
+ }
p.setLastName(names[0]);
citation.addAuthor(p);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2010-07-16 02:32:14
|
Revision: 738
http://treebase.svn.sourceforge.net/treebase/?rev=738&view=rev
Author: youjun
Date: 2010-07-16 02:32:08 +0000 (Fri, 16 Jul 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java
trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionList.jsp
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java 2010-07-16 01:36:17 UTC (rev 737)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java 2010-07-16 02:32:08 UTC (rev 738)
@@ -70,14 +70,14 @@
File uploadDir=new File(uploadpath);
if(!uploadDir.exists()){
importStatus = "NOT FOUND";
- request.setAttribute("importStatus", importStatus);
+ request.getSession().setAttribute("importStatus", importStatus);
return new ModelAndView("redirect:/user/submissionList.html");
}
File[] uploadFiles = uploadDir.listFiles(new FileFilter(){public boolean accept(File file){return file.isDirectory();}});
if(uploadFiles.length==0){
importStatus = "NOT FOUND";
- request.setAttribute("importStatus", importStatus);
+ request.getSession().setAttribute("importStatus", importStatus);
return new ModelAndView("redirect:/user/submissionList.html");
}
File bagitPath = uploadFiles[0];
@@ -108,7 +108,7 @@
importStatus = "FAILED";
}
- request.setAttribute("importStatus", importStatus);
+ request.getSession().setAttribute("importStatus", importStatus);
request.getSession().removeAttribute("importKey");
return new ModelAndView("redirect:/user/submissionList.html");
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionList.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionList.jsp 2010-07-16 01:36:17 UTC (rev 737)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionList.jsp 2010-07-16 02:32:08 UTC (rev 738)
@@ -105,14 +105,14 @@
</display:table>
</fieldset>
<fieldset>
-<legend>Dryad Import Result
+<legend>Dryad Import Result:
<a href="#" class="openHelp" onclick="openHelp('dryadImport')"><img class="iconButton" src="<fmt:message key="icons.help"/>" /></a>
</legend>
<div align="center">
<c:choose>
- <c:when test="${importStatus =='NOT FOUND'}"><c:out value="Sorry, we cannot find your data"/></c:when>
- <c:when test="${importStatus =='OK'}"><c:out value="Import finished"/></c:when>
- <c:when test="${importStatus =='FAILED'}"><c:out value="Sorry, One or more data file cannot parsed correctly, you may add your data via treebase interfaces"/></c:when>
+ <c:when test="${sessionScope.importStatus =='NOT FOUND'}"><c:out value="Sorry, we cannot find your data"/></c:when>
+ <c:when test="${sessionScope.importStatus =='OK'}"><c:out value="Import finished"/></c:when>
+ <c:when test="${sessionScope.importStatus =='FAILED'}"><c:out value="Sorry, One or more data file cannot parsed correctly, you may add your data via treebase interfaces"/></c:when>
</c:choose>
</div>
</fieldset>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2010-07-16 01:36:28
|
Revision: 737
http://treebase.svn.sourceforge.net/treebase/?rev=737&view=rev
Author: youjun
Date: 2010-07-16 01:36:17 +0000 (Fri, 16 Jul 2010)
Log Message:
-----------
handshaking, add study name, enable parser elements without namespace
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java 2010-07-16 00:12:57 UTC (rev 736)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java 2010-07-16 01:36:17 UTC (rev 737)
@@ -87,7 +87,7 @@
CitationParser cparser= new CitationParser(dataPath);
Citation citation = cparser.getCitation();
Study study = new Study();
-
+ study.setName(bagitPath.getName());
study.setCitation(citation);
citation.setStudy(study);
Submission submission = mSubmissionService.createSubmission(user, study);
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java 2010-07-16 00:12:57 UTC (rev 736)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java 2010-07-16 01:36:17 UTC (rev 737)
@@ -113,7 +113,7 @@
}
private Node getNode(Element root, String localName, Namespace namespace){
- if(namespace==null)return root.element(new QName(localName));
+ if(namespace==null)return root.element(localName);
return root.element(new QName(localName, namespace));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2010-07-16 00:17:12
|
Revision: 736
http://treebase.svn.sourceforge.net/treebase/?rev=736&view=rev
Author: youjun
Date: 2010-07-16 00:12:57 +0000 (Fri, 16 Jul 2010)
Log Message:
-----------
fix a null pointer, "null.trim()=?"
Modified Paths:
--------------
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/admin/Person.java
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/admin/Person.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/admin/Person.java 2010-07-15 20:51:58 UTC (rev 735)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/admin/Person.java 2010-07-16 00:12:57 UTC (rev 736)
@@ -197,7 +197,7 @@
fullNameCitationStyle.append(getFirstName().trim().substring(0, 1).toUpperCase()).append(
".");
- if (getMiddleName().trim() != null && getMiddleName().trim().length() > 0) {
+ if (getMiddleName() != null && getMiddleName().trim().length() > 0) {
fullNameCitationStyle
.append(getMiddleName().trim().substring(0, 1).toUpperCase()).append(".");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2010-07-15 20:52:04
|
Revision: 735
http://treebase.svn.sourceforge.net/treebase/?rev=735&view=rev
Author: youjun
Date: 2010-07-15 20:51:58 +0000 (Thu, 15 Jul 2010)
Log Message:
-----------
handshaking add new citation object to a user
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudyFormController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/DryadUtil.java
trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java 2010-07-15 00:13:45 UTC (rev 734)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java 2010-07-15 20:51:58 UTC (rev 735)
@@ -1,13 +1,30 @@
package org.cipres.treebase.web.controllers;
+import java.io.File;
+import java.io.FileFilter;
+import java.util.Collection;
+import java.util.List;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.Controller;
+import org.springframework.web.servlet.view.RedirectView;
+import org.cipres.treebase.TreebaseUtil;
+import org.cipres.treebase.domain.admin.User;
import org.cipres.treebase.domain.admin.UserRole;
+import org.cipres.treebase.domain.admin.UserService;
+import org.cipres.treebase.domain.study.Citation;
+import org.cipres.treebase.domain.study.Study;
+import org.cipres.treebase.domain.study.Submission;
+import org.cipres.treebase.domain.study.SubmissionService;
+import org.cipres.treebase.web.model.MyProgressionListener;
+import org.cipres.treebase.web.util.CitationParser;
+import org.cipres.treebase.web.util.ControllerUtil;
+import org.cipres.treebase.web.util.DryadUtil;
/**
* @author madhu
@@ -16,17 +33,86 @@
*
*/
public class ProcessUserController implements Controller {
+ private SubmissionService mSubmissionService;
+ private UserService mUserService;
+
+ public UserService getUserService() {
+ return mUserService;
+ }
+ public void setUserService(UserService mUserService) {
+ this.mUserService = mUserService;
+ }
+
+ public SubmissionService getSubmissionService() {
+ return mSubmissionService;
+ }
+
+ public void setSubmissionService(SubmissionService mSubmissionService) {
+ this.mSubmissionService = mSubmissionService;
+ }
+
private static final Logger LOGGER = Logger.getLogger(ProcessUserController.class);
public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response)
throws Exception {
+
String importKey = (String)request.getSession().getAttribute("importKey");
+ User user = ControllerUtil.getUser(request, mUserService);
- if (importKey != null && importKey.length()>0) {
-
- return new ModelAndView("redirect:/user/studyForm.html");
- }
+ if(importKey != null && importKey.length()>0){
+
+ String uploadpath = request.getSession().getServletContext()
+ .getRealPath(TreebaseUtil.FILESEP + "DryadFileUpload")
+ + TreebaseUtil.FILESEP + importKey;
+ String importStatus="";
+
+ File uploadDir=new File(uploadpath);
+ if(!uploadDir.exists()){
+ importStatus = "NOT FOUND";
+ request.setAttribute("importStatus", importStatus);
+ return new ModelAndView("redirect:/user/submissionList.html");
+ }
+
+ File[] uploadFiles = uploadDir.listFiles(new FileFilter(){public boolean accept(File file){return file.isDirectory();}});
+ if(uploadFiles.length==0){
+ importStatus = "NOT FOUND";
+ request.setAttribute("importStatus", importStatus);
+ return new ModelAndView("redirect:/user/submissionList.html");
+ }
+ File bagitPath = uploadFiles[0];
+ File dataPath = new File(bagitPath, "data");
+
+ try{
+ CitationParser cparser= new CitationParser(dataPath);
+ Citation citation = cparser.getCitation();
+ Study study = new Study();
+
+ study.setCitation(citation);
+ citation.setStudy(study);
+ Submission submission = mSubmissionService.createSubmission(user, study);
+
+ List<File> files = DryadUtil.getDataFiles(dataPath);
+ for(int i=0; i<files.size(); i++ )
+ submission.getStudy().addNexusFile(files.get(i).getName(), "NEXUS");
+ MyProgressionListener listener = new MyProgressionListener();
+ //getSubmissionService().addNexusFilesJDBC(submission, files, listener);
+
+ // save Study object to session
+ //mSubmissionService.save(submission);
+ mSubmissionService.save(study);
+ //mSubmissionService.save(citation);
+
+ importStatus = "OK";
+ }catch (Exception e) {
+ importStatus = "FAILED";
+ }
+
+ request.setAttribute("importStatus", importStatus);
+ request.getSession().removeAttribute("importKey");
+ return new ModelAndView("redirect:/user/submissionList.html");
+
+ }
if (request.isUserInRole(UserRole.ROLE_ADMIN) || request.isUserInRole(UserRole.ROLE_ASSO_EDITOR)) {
return new ModelAndView("redirect:/admin/administrationPage.html");
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudyFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudyFormController.java 2010-07-15 00:13:45 UTC (rev 734)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudyFormController.java 2010-07-15 20:51:58 UTC (rev 735)
@@ -1,33 +1,24 @@
package org.cipres.treebase.web.controllers;
-import java.io.File;
-import java.io.FileFilter;
-import java.util.Collection;
-
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.cipres.treebase.TreebaseUtil;
import org.apache.log4j.Logger;
-import org.springframework.validation.BindException;
-import org.springframework.web.bind.ServletRequestUtils;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.view.RedirectView;
-
+import org.cipres.treebase.TreebaseUtil;
import org.cipres.treebase.domain.admin.User;
import org.cipres.treebase.domain.admin.UserService;
-import org.cipres.treebase.domain.study.Citation;
import org.cipres.treebase.domain.study.Study;
import org.cipres.treebase.domain.study.StudyService;
import org.cipres.treebase.domain.study.Submission;
import org.cipres.treebase.domain.study.SubmissionService;
import org.cipres.treebase.web.Constants;
-import org.cipres.treebase.web.model.MyProgressionListener;
-import org.cipres.treebase.web.util.CitationParser;
import org.cipres.treebase.web.util.ControllerUtil;
-import org.cipres.treebase.web.util.DryadUtil;
+import org.springframework.validation.BindException;
+import org.springframework.web.bind.ServletRequestUtils;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.view.RedirectView;
/**
* StudyFormController.java
@@ -104,54 +95,7 @@
Study study = (Study) command;
User user = ControllerUtil.getUser(request, mUserService);
- String importKey = (String)request.getSession().getAttribute("importKey");
- //request.getSession().removeAttribute("importKey");
- if(importKey != null && importKey.length()>0){
- String uploadpath = getServletContext()
- .getRealPath(TreebaseUtil.FILESEP + "DryadFileUpload")
- + TreebaseUtil.FILESEP + importKey;
- String importStatus="";
-
- File uploadDir=new File(uploadpath);
- if(!uploadDir.exists()){
- importStatus = "NOT FOUND";
- return new ModelAndView(new RedirectView("submissionList.html"));
- }
-
- File[] uploadFiles = uploadDir.listFiles(new FileFilter(){public boolean accept(File file){return file.isDirectory();}});
- if(uploadDir.length()==0){
- importStatus = "NOT FOUND";
- return new ModelAndView(new RedirectView("submissionList.html"));
- }
- File bagitPath = uploadFiles[0];
- File dataPath = new File(bagitPath, "data");
-
- try{
- Submission submission = mSubmissionService.createSubmission(user, new Study());
- CitationParser cparser= new CitationParser(dataPath);
- Citation citation = cparser.getCitation();
- submission.getStudy().setCitation(citation);
- citation.setStudy(submission.getStudy());
-
- Collection<File> files = DryadUtil.getDataFiles(dataPath);
- MyProgressionListener listener = new MyProgressionListener();
- //getSubmissionService().addNexusFilesJDBC(submission, files, listener);
- // save Study object to session
- ControllerUtil.saveStudy(request, submission.getStudy());
- importStatus = "OK";
- }catch (Exception e) {
- importStatus = "FAILED";
- }
-
- request.setAttribute("importStatus", importStatus);
- //request.getSession().removeAttribute("importKey");
- return new ModelAndView(new RedirectView("submissionList.html"));
-
- }
-
-
-
if (request.getParameter(ACTION_SUBMIT) != null) {
// Study must be submitted with citation together
// here we are just saving the data to the session
@@ -214,10 +158,7 @@
request.getSession().removeAttribute(Constants.STUDY_MAP);
return new Study();
}
-
- if(request.getSession().getAttribute("importKey") != null)
- return new Study();
-
+
// if we are updating a data that's already in the db (access from RHS menu)
study = ControllerUtil.findStudy(request, mStudyService);
return study;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java 2010-07-15 00:13:45 UTC (rev 734)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/CitationParser.java 2010-07-15 20:51:58 UTC (rev 735)
@@ -56,7 +56,7 @@
private void loadData(){
-
+
Node description = getNode(pubRoot,"description",dcterms);
if(description!=null)citation.setAbstract(description.getText());
@@ -104,11 +104,12 @@
}
- if(getNode(pubRoot,"pubStatus",null).getText()!=null){
+ if(getNode(pubRoot,"pubStatus",null)!=null){
if("published".compareToIgnoreCase(getNode(pubRoot,"pubStatus",null).getText())==0)
citation.setPublished(true);
else citation.setPublished(false);
- }
+ }
+
}
private Node getNode(Element root, String localName, Namespace namespace){
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/DryadUtil.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/DryadUtil.java 2010-07-15 00:13:45 UTC (rev 734)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/DryadUtil.java 2010-07-15 20:51:58 UTC (rev 735)
@@ -16,7 +16,7 @@
public class DryadUtil {
- public static Collection<File> getDataFiles(File path) {
+ public static List<File> getDataFiles(File path) {
// TODO Auto-generated method stub
File[] files = path.listFiles(new FileFilter() {
public boolean accept(File file) {
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml 2010-07-15 00:13:45 UTC (rev 734)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml 2010-07-15 20:51:58 UTC (rev 735)
@@ -21,8 +21,10 @@
<!-- LIST OF CONTROLLERS FOR WEB-TIER -->
<!-- ========================================================== -->
- <bean id="processUserController" class="org.cipres.treebase.web.controllers.ProcessUserController"/>
-
+ <bean id="processUserController" class="org.cipres.treebase.web.controllers.ProcessUserController">
+ <property name="submissionService"><ref bean="submissionService"></ref></property>
+ <property name="userService"><ref bean="userService"></ref></property>
+ </bean>
<bean id="anyObjectAsRDFController" class="org.cipres.treebase.web.controllers.AnyObjectAsRDFController">
<property name="studyService"><ref bean="studyService"></ref></property>
</bean>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2010-07-15 00:16:28
|
Revision: 734
http://treebase.svn.sourceforge.net/treebase/?rev=734&view=rev
Author: youjun
Date: 2010-07-15 00:13:45 +0000 (Thu, 15 Jul 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudyFormController.java
trunk/treebase-web/src/main/webapp/WEB-INF/pages/loginForm.jsp
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudyFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudyFormController.java 2010-07-14 20:45:11 UTC (rev 733)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudyFormController.java 2010-07-15 00:13:45 UTC (rev 734)
@@ -105,7 +105,7 @@
Study study = (Study) command;
User user = ControllerUtil.getUser(request, mUserService);
String importKey = (String)request.getSession().getAttribute("importKey");
- request.getSession().removeAttribute("importKey");
+ //request.getSession().removeAttribute("importKey");
if(importKey != null && importKey.length()>0){
String uploadpath = getServletContext()
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/loginForm.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/loginForm.jsp 2010-07-14 20:45:11 UTC (rev 733)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/loginForm.jsp 2010-07-15 00:13:45 UTC (rev 734)
@@ -2,14 +2,14 @@
<form method="post" id="loginForm" action="<c:url value="/j_security_check"/>" >
-<!--
+
<%
if(request.getParameter("importKey") != null){
session.setAttribute("importKey",request.getParameter("importKey"));
}
%>
--->
+
<fieldset>
<legend>Login</legend>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
