You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/02/05 16:27:20 UTC
svn commit: r503720 -
/incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
Author: snoopdave
Date: Mon Feb 5 07:27:19 2007
New Revision: 503720
URL: http://svn.apache.org/viewvc?view=rev&rev=503720
Log:
After some discussions with Tim B it seems preferable to specify no scheme for tags.
Modified:
incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
Modified: incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java?view=diff&rev=503720&r1=503719&r2=503720
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java Mon Feb 5 07:27:19 2007
@@ -215,7 +215,6 @@
// to site because tags can be considered site-wide
AtomService.Categories tags = new AtomService.Categories();
tags.setFixed(false);
- tags.setScheme(getSiteTagScheme());
entryCol.addCategories(tags);
} catch (Exception e) {
@@ -1001,12 +1000,11 @@
atomCat.setTerm(entry.getCategory().getPath().substring(1));
categories.add(atomCat);
- // Add Atom categories for each Roller tag, using tag scheme
+ // Add Atom categories for each Roller tag with null scheme
for (Iterator tagit = entry.getTags().iterator(); tagit.hasNext();) {
WeblogEntryTagData tag = (WeblogEntryTagData) tagit.next();
Category newcat = new Category();
newcat.setTerm(tag.getName());
- newcat.setScheme(getSiteTagScheme());
categories.add(newcat);
}
atomEntry.setCategories(categories);
@@ -1147,12 +1145,12 @@
}
// Now process incoming categories that are tags:
- // Atom categories with site-level scheme are Roller tags
+ // Atom categories with no scheme are considered tags.
String tags = "";
if (categories != null && categories.size() > 0) {
for (int i=0; i<categories.size(); i++) {
Category cat = (Category)categories.get(i);
- if (cat.getScheme() != null && cat.getScheme().equals(getSiteTagScheme())) {
+ if (cat.getScheme() == null) {
tags = tags + " " + cat.getTerm();
}
}
@@ -1162,10 +1160,6 @@
private String getWeblogCategoryScheme(WebsiteData website) {
return URLUtilities.getWeblogURL(website, null, true);
- }
-
- private String getSiteTagScheme() {
- return RollerRuntimeConfig.getAbsoluteContextURL();
}
private String filePathFromPathInfo(String[] pathInfo) {