small sanitary fixes

- exclude unix shell scripts in NSIS windows install archive
- replace link to env/grafics/yacy.gif to yacy.png (build.nsi)
- remove unused code lines (Blacklist_p, Response, WordReferenceVars)
- type & xhtml (RankingSolr_p.html)
pull/1/head
reger 12 years ago
parent f301336adf
commit 276e63401e

@ -166,7 +166,7 @@ Section "YaCy"
nsExec::Exec 'attrib +I "$INSTDIR"'
nsExec::Exec 'attrib +I "$INSTDIR\*" /S /D'
File /r "RELEASE\MAIN\*"
File /r /x *.sh "RELEASE\MAIN\*"
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\YaCy" "DisplayName" "YaCy"
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\YaCy" "UninstallString" '"$INSTDIR\uninstall.exe"'

@ -653,7 +653,6 @@ public class Blacklist_p {
int pos = newEntry.indexOf('/',0);
if (pos < 0) {
// add default empty path pattern
pos = newEntry.length();
newEntry = newEntry + "/.*";
}

@ -8,20 +8,20 @@
#%env/templates/header.template%#
#%env/templates/submenuSearchConfiguration.template%#
<h2>Solr Ranking Configuration</h2>
<p>These are ranking attributes for Solr. This ranking applies for internal and remote Solr acess.</p>
<p>These are ranking attributes for Solr. This ranking applies for internal and remote Solr access.</p>
<form class="dsearch" action="RankingSolr_p.html" method="post" enctype="multipart/form-data">
<fieldset>
<legend>Solr Double Content Detection</legend><p>Double-Content detection is done using a ranking on a 'unique'-Field, named 'fuzzy_signature_unique_b'.
This field is set during parsing and is influenced by two attributes for the <a href="http://lucene.apache.org/solr/api-4_0_0-BETA/org/apache/solr/update/processor/TextProfileSignature.html">TextProfileSignature</a> class.</p>
<dl>
<dt style="width:260px"><label for="minTokenLen">minTokenLen</label></dt>
<dd style="width:360px; float:left; display:inline;" id="minTokenLen">
<input name="minTokenLen" id="minTokenLen" type="text" align="right" size="10" value="#[minTokenLen]#"><br/>
<dd style="width:360px; float:left; display:inline;" id="dd_minTokenLen">
<input name="minTokenLen" id="minTokenLen" type="text" align="right" size="10" value="#[minTokenLen]#" /><br />
This is the minimum length of a word which shall be considered as element of the signature. Should be either 2 or 3.
</dd>
<dt style="width:260px"><label for="quantRate">quantRate</label></dt>
<dd style="width:360px; float:left; display:inline;" id="quantRate">
<input name="quantRate" id="quantRate" type="text" align="right" size="10" value="#[quantRate]#"><br/>
<dd style="width:360px; float:left; display:inline;" id="dd_quantRate">
<input name="quantRate" id="quantRate" type="text" align="right" size="10" value="#[quantRate]#" /><br />
The quantRate is a measurement for the number of words that take part in a signature computation. The higher the number, the less
words are used for the signature.
For minTokenLen = 2 the quantRate value should not be below 0.24; for minTokenLen = 3 the quantRate value must be not below 0.5.
@ -38,9 +38,9 @@
<fieldset>
<legend>Solr Boosts</legend>
<dl>#{boosts}#
<dt style="width:260px"><label for="#[field]#">#[field]#</label></dt>
<dt style="width:260px"><label for="boost_#[field]#">#[field]#</label></dt>
<dd style="width:360px; float:left; display:inline;" id="boost_dd_#[field]#">
<input name="boost_#[field]#" id="boost_#[field]#" type="text" align="right" size="10" value="#[boost]#">
<input name="boost_#[field]#" id="boost_#[field]#" type="text" align="right" size="10" value="#[boost]#" />
</dd>#{/boosts}#
<dt style="width:260px"></dt>
<dd style="width:360px; float:left; display:inline;">

@ -11,7 +11,7 @@
<tr style="height:36px;">
<td width="240">
<a href="http://www.yacy.net">
<img width="52" height="33" border="0" src="/env/grafics/yacy.gif" align="top" alt="YaCy-Logo" />
<img width="52" height="33" border="0" src="/env/grafics/yacy.png" align="top" alt="YaCy-Logo" />
</a>
</td>
<td width="50%" align="center">

@ -4,7 +4,7 @@
xmlns:suggestions="http://www.opensearch.org/specifications/opensearch/extensions/suggestions/1.1">
<ShortName>#(compareyacy)#::Compare #(/compareyacy)#YaCy/#[clientname]#</ShortName>
<LongName>YaCy.net - #[SearchPageGreeting]#</LongName>
<Image type="image/gif">http://#[thisaddress]#/env/grafics/yacy.gif</Image>
<Image type="image/gif">http://#[thisaddress]#/env/grafics/yacy.png</Image>
<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAAAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////Chiu+fBm+fRq+fRq+fRq+fRq+fRq8ehXMmk////////////////////////////++exjUqGfZsnjYsXbYsXbYsXbZsnjTp2W+fBr///////////////////////////+9exfs2r/69/L58+z58+z58+z59e/z59bChSn///////////////////////////+9fBnnz638+fX69O369e748un38Ob59O3Ll0fVrGz////////////////////////Jk0HJlUjXuYrWt4jVtYPr28T58+r59OzPn1fPnlX////////////////////////Rolu8eRXCiTPEjTvCijbNnlj169359e7Zs3vLlkf////////////////////////UqmrAgSLt3MP27eH1693169327+T59Ozo0rG/gB////////////////////////////+/gCDv4Mn48+v38Of59Oz58+v48+vr2b2+fRv///////////////////////////+9ehXr17n58+z48ejo0bDp07T48+zx49DBhCj///////////////////////////+/fhzjyJ/59Oz59OzQoVvNmU759Oz58+vKlUbXrnH////////////////////////LlkfUqmn59Oz48+vZtHzNm1D48+v59OzPoFjOnlX////////////////////////OnVPOnFL59e348+vq1rnEiC7u38j69vDXsHTIkT3////////////////////////UqWjIkD327+T58+3s2bzAgSLp07T79/Pmzqq+fBn///////////////////////////+/fx7v4Mr7+PTx5NDHkD3kyqP8+vjs2r+9exf///////////////////////////++fBjQoFnVq2zTp2bGjTjJk0LWrW7SpWC+exf////////////////////////////Nm1C6dQy7eBG8eBK9exe8ehS7dxC6dQzLlkj////////////AH///wB8x+sAf///AD/+PwA///8AP///AD///4A9PU+APoz/gB///4AdxvOAHoz/gB3368AfjU/AHT1PwB/+P
</Image>
<Language>en-us</Language>

@ -18,7 +18,7 @@
<tr height="36">
<td width="240">
<a href="http://www.yacy.net">
<img width="52" height="33" border="0" src="/env/grafics/yacy.gif" align="top" alt="YaCy-Logo">
<img width="52" height="33" border="0" src="/env/grafics/yacy.png" align="top" alt="YaCy-Logo">
</a>
</td>
<td width="50%" align="center">

@ -986,7 +986,7 @@ public class yacysearch {
hostName += ":" + serverCore.getPortNr(env.getConfig("port", "8090"));
}
prop.put("searchBaseURL", "http://" + hostName + "/yacysearch.html");
prop.put("rssYacyImageURL", "http://" + hostName + "/env/grafics/yacy.gif");
prop.put("rssYacyImageURL", "http://" + hostName + "/env/grafics/yacy.png");
prop.put("thisaddress", hostName);
}

@ -127,7 +127,7 @@ public class yacysearch_location {
prop.put("kml_date822", HeaderFramework.formatRFC1123(new Date()));
prop.put("kml_promoteSearchPageGreeting", promoteSearchPageGreeting);
prop.put("kml_rssYacyImageURL", "http://" + hostName + "/env/grafics/yacy.gif");
prop.put("kml_rssYacyImageURL", "http://" + hostName + "/env/grafics/yacy.png");
prop.put("kml_searchBaseURL", "http://" + hostName + "/yacysearch_location.rss");
prop.putXML("kml_rss_query", originalquerystring);
prop.put("kml_rss_queryenc", originalquerystring.replace(' ', '+'));

@ -231,12 +231,6 @@ public class Response {
return docDate;
}
public String language() {
// please avoid this method if a condenser document is available, because the condenser has a built-in language detection
// this here is only a guess using the TLD
return url().language();
}
public CrawlProfile profile() {
return this.profile;
}

@ -114,7 +114,6 @@ public class WordReferenceVars extends AbstractReference implements WordReferenc
final Bitfield flags, // attributes to the url and to the word according the url
final double termfrequency
) {
if (language == null || language.length != 2) language = default_language;
//final int mddct = MicroDate.microDateDays(updatetime);
this.flags = flags;
//this.freshUntil = Math.max(0, mddlm + (mddct - mddlm) * 2);

Loading…
Cancel
Save