Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.gitorious.org/yacy/rc1.git

Browse Source
This commit is contained in:
sixcooler 2011-11-16 02:05:11 +01:00
commit 787f6ef039
5 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.classpath
View File

@ -9,7 +9,6 @@
<classpathentry excluding="bookmarks/posts/|bookmarks/|util/|bookmarks/xbel/|bookmarks/tags/|ymarks/" kind="src" path="htroot/api"/>
<classpathentry kind="src" path="htroot/api/bookmarks/posts"/>
<classpathentry excluding="posts/|xbel/|tags/" kind="src" path="htroot/api/bookmarks"/>
<classpathentry kind="src" path="htroot/api/util"/>
<classpathentry kind="src" path="htroot/api/bookmarks/xbel"/>
<classpathentry kind="src" path="htroot/api/bookmarks/tags"/>
<classpathentry kind="src" path="htroot/api/ymarks"/>

0
htroot/api/util/ynetSearch.java → htroot/api/ynetSearch.java
View File

0
htroot/api/util/ynetSearch.json → htroot/api/ynetSearch.json
View File

0
htroot/api/util/ynetSearch.xml → htroot/api/ynetSearch.xml
View File

2
htroot/yacy/ui/sidebar/sidebar_1.html
View File

@ -78,7 +78,7 @@
<option value="/yacysearch.json?resource=global&verify=true" selected="selected">freeworld</option>
<option value="/yacysearch.json?resource=local&verify=true" >local peer</option>
<option value="ymarks" >bookmarks</option>
<option value="/api/util/ynetSearch.json?login=&url=http://sciencenet.fzk.de:8080/yacysearch.json?resource=global&verify=true" >sciencenet-ynetSearch</option>
<option value="/api/ynetSearch.json?login=&url=http://sciencenet.fzk.de:8080/yacysearch.json?resource=global&verify=true" >sciencenet-ynetSearch</option>
<option value="http://sciencenet.fzk.de:8080/yacysearch.json?callback=?&resource=global&verify=true" >sciencenet-JsonP</option>
<option value="http://yacy.kicks-ass.net:8080/yacysearch.json?callback=?&resource=global&verify=true" >apfelmaennchen-JsonP</option>
</select>