boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

enabled YMark Import for /Table_YMark_p.html

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7319 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
apfelmaennchen 15 years ago
parent 2726606fc8
commit f147a022f8
5 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File

12
htroot/Table_YMark_p.html
Unescape View File

@ -156,7 +156,7 @@
<label for="tags">Tags</label>
</dt>
<dd>
<select name="tags" onchange='this.form.submit()'>
<select name="tags" style="width: 180px" onchange='this.form.submit()'>
<option value="" selected>select a tag</option>
#{tags}#
<option value="#[tagName]#">#[tagName]#</option>
@ -167,7 +167,7 @@
<label for="folders">Folders</label>
</dt>
<dd>
<select name="folders" style="width: 200px" onchange='this.form.submit()'>
<select name="folders" style="width: 180px" onchange='this.form.submit()'>
<option value="" selected>select a folder</option>
#{folders}#
<option value="#[folderName]#">#[folderName]#</option>
@ -176,8 +176,12 @@
</dd>
</dl>
</fieldset>
</form>
<fieldset>
<legend>Import Bookmarks</legend>
<form action="/api/ymarks/import_ymark.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
<input type="hidden" name="table" value="#[table]#" />
<input type="hidden" name="redirect" value="/Table_YMark_p.html?table=#[table]#&count=100" />
<dl>
<dt>
<label for="importer">Importer:</label>
@ -195,9 +199,9 @@
<input type="file" name="bmkfile" id="bmkfile" size="10"/>
</dd>
</dl>
<input type="submit" name="importbookmarks" value="import" disabled />
<input type="submit" name="importbookmarks" value="import" />
</form>
</fieldset>
</form>
</div>
#(/showselection)#
#%env/templates/footer.template%#

3
htroot/Table_YMark_p.java
Unescape View File

@ -33,6 +33,9 @@ public class Table_YMark_p {
if (table != null)
bmk_user = table.substring(0,table.indexOf('_'));
// currently selected table
prop.put("showselection_table", table);
// show table selection
int count = 0;
Iterator<String> ti = sb.tables.tables();

14
htroot/api/ymarks/import_ymark.html
Unescape View File

@ -0,0 +1,14 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Import Bookmarks</title>
#(redirect)#::<meta HTTP-EQUIV="REFRESH" content="0; url=#[url]#" />#(/redirect)#
</head>
<body>
#(result)#
<p>something went wrong</p>
::
<p>done</p>
#(/result)#
</body>
</html>

16
htroot/api/ymarks/import_ymark.java
Unescape View File

@ -29,9 +29,13 @@ public class import_ymark {
ByteArrayInputStream byteIn = null;
if(isAdmin || isAuthUser) {
final String bmk_user = (isAuthUser ? user.getUserName() : YMarkTables.USER_ADMIN);
String bmk_user = (isAuthUser ? user.getUserName() : YMarkTables.USER_ADMIN);
if(isAdmin && post.containsKey("table") && post.get("table").length() > 0) {
bmk_user = post.get("table").substring(0, post.get("table").indexOf('_'));
}
if(post.containsKey("bmkfile") && post.containsKey("importer")){
try {
try {
byteIn = new ByteArrayInputStream(post.get("bmkfile$file").getBytes("UTF-8"));
} catch (UnsupportedEncodingException e) {
//TODO: display an error message
@ -84,11 +88,15 @@ public class import_ymark {
}
}
prop.put("result", "1");
}
}
}
} else {
prop.put(YMarkTables.USER_AUTHENTICATE,YMarkTables.USER_AUTHENTICATE_MSG);
}
}
if(post.containsKey("redirect") && post.get("redirect").length() > 0) {
prop.put("redirect_url", post.get("redirect"));
prop.put("redirect", "1");
}
// return rewrite properties
return prop;
}

6
htroot/api/ymarks/info.html
Unescape View File

@ -43,7 +43,7 @@
<li><i>type:</i> xbel | rss | rdf</li>
</ul>
</li>
<li>import_ymark.xml
<li>import_ymark.[xml | html]
<ul>
<li><i>bmfile:</i> the bookmark file you want to import
<ul>
@ -54,7 +54,9 @@
</li>
</ul>
</li>
<li><i>importer:</i> html | xbel | surrogates</li>
<li><i>importer:</i> html | xbel </li>
<li><i>table:</i> the table you want to import in (admin authentication required)</li>
<li><i>redirect:</i> you can specify a html redirect (HTTP-EQUIV="REFRESH")</li>
</ul>
</li>
</ul>

Write Preview
Loading…
Cancel
Save