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

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

Browse Source
pull/1/head
Michael Peter Christen 10 years ago
parent 9fce8bf2a5 682dd94925
commit 8ef56eda90
23 changed files with 252 additions and 246 deletions
Show Stats Download Patch File Download Diff File

10
.classpath
Unescape View File

@ -19,7 +19,7 @@
<classpathentry kind="lib" path="lib/jsch-0.1.51.jar"/>
<classpathentry kind="lib" path="lib/jakarta-oro-2.0.8.jar"/>
<classpathentry kind="lib" path="lib/apache-mime4j-0.6.jar"/>
<classpathentry kind="lib" path="lib/commons-fileupload-1.2.2.jar"/>
<classpathentry kind="lib" path="lib/commons-fileupload-1.3.1.jar"/>
<classpathentry kind="lib" path="lib/json-simple-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/xercesImpl.jar"/>
<classpathentry kind="lib" path="lib/xml-apis.jar"/>
@ -28,10 +28,10 @@
<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
<classpathentry kind="lib" path="lib/jaudiotagger-2.0.4-20111207.115108-15.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.9.jar"/>
<classpathentry kind="lib" path="lib/jcl-over-slf4j-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/jcl-over-slf4j-1.7.9.jar"/>
<classpathentry kind="lib" path="lib/wstx-asl-3.2.9.jar"/>
<classpathentry kind="lib" path="lib/slf4j-jdk14-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/log4j-over-slf4j-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/slf4j-jdk14-1.7.9.jar"/>
<classpathentry kind="lib" path="lib/log4j-over-slf4j-1.7.9.jar"/>
<classpathentry kind="lib" path="lib/httpclient-4.3.6.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.3.3.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.3.6.jar"/>
@ -51,7 +51,7 @@
<classpathentry kind="lib" path="lib/poi-3.10.1.jar"/>
<classpathentry kind="lib" path="lib/poi-scratchpad-3.10.1.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.3.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.6.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.9.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-common-4.10.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.10.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-classification-4.10.2.jar"/>

10
addon/YaCy.app/Contents/Info.plist
Unescape View File

@ -43,7 +43,7 @@
<string>$JAVAROOT/lib/chardet.jar</string>
<string>$JAVAROOT/lib/commons-codec-1.9.jar</string>
<string>$JAVAROOT/lib/commons-compress-1.8.1.jar</string>
<string>$JAVAROOT/lib/commons-fileupload-1.2.2.jar</string>
<string>$JAVAROOT/lib/commons-fileupload-1.3.1.jar</string>
<string>$JAVAROOT/lib/commons-io-2.3.jar</string>
<string>$JAVAROOT/lib/commons-jxpath-1.3.jar</string>
<string>$JAVAROOT/lib/commons-lang-2.6.jar</string>
@ -60,7 +60,7 @@
<string>$JAVAROOT/lib/jakarta-oro-2.0.8.jar</string>
<string>$JAVAROOT/lib/jaudiotagger-2.0.4-20111207.115108-15.jar</string>
<string>$JAVAROOT/lib/jcifs-1.3.17.jar</string>
<string>$JAVAROOT/lib/jcl-over-slf4j-1.7.2.jar</string>
<string>$JAVAROOT/lib/jcl-over-slf4j-1.7.9.jar</string>
<string>$JAVAROOT/lib/jempbox-1.8.8.jar</string>
<string>$JAVAROOT/lib/javax.servlet-api-3.1.0.jar</string>
<string>$JAVAROOT/lib/jetty-client-9.2.6.v20141205.jar</string>
@ -80,7 +80,7 @@
<string>$JAVAROOT/lib/jsch-0.1.51.jar</string>
<string>$JAVAROOT/lib/json-simple-1.1.1.jar</string>
<string>$JAVAROOT/lib/jsoup-1.8.1.jar</string>
<string>$JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar</string>
<string>$JAVAROOT/lib/log4j-over-slf4j-1.7.9.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-common-4.10.2.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.10.2.jar</string>
<string>$JAVAROOT/lib/lucene-classification-4.10.2.jar</string>
@ -102,8 +102,8 @@
<string>$JAVAROOT/lib/pdfbox-1.8.8.jar</string>
<string>$JAVAROOT/lib/poi-3.10.1.jar</string>
<string>$JAVAROOT/lib/poi-scratchpad-3.10.1.jar</string>
<string>$JAVAROOT/lib/slf4j-api-1.7.6.jar</string>
<string>$JAVAROOT/lib/slf4j-jdk14-1.7.2.jar</string>
<string>$JAVAROOT/lib/slf4j-api-1.7.9.jar</string>
<string>$JAVAROOT/lib/slf4j-jdk14-1.7.9.jar</string>
<string>$JAVAROOT/lib/solr-core-4.10.2.jar</string>
<string>$JAVAROOT/lib/solr-solrj-4.10.2.jar</string>
<string>$JAVAROOT/lib/spatial4j-0.4.1.jar</string>

10
build.xml
Unescape View File

@ -167,7 +167,7 @@
<pathelement location="${lib}/chardet.jar" />
<pathelement location="${lib}/commons-codec-1.9.jar" />
<pathelement location="${lib}/commons-compress-1.8.1.jar" />
<pathelement location="${lib}/commons-fileupload-1.2.2.jar" />
<pathelement location="${lib}/commons-fileupload-1.3.1.jar" />
<pathelement location="${lib}/commons-io-2.3.jar" />
<pathelement location="${lib}/commons-jxpath-1.3.jar" />
<pathelement location="${lib}/commons-lang-2.6.jar" />
@ -184,7 +184,7 @@
<pathelement location="${lib}/jakarta-oro-2.0.8.jar" />
<pathelement location="${lib}/jaudiotagger-2.0.4-20111207.115108-15.jar" />
<pathelement location="${lib}/jcifs-1.3.17.jar" />
<pathelement location="${lib}/jcl-over-slf4j-1.7.2.jar" />
<pathelement location="${lib}/jcl-over-slf4j-1.7.9.jar" />
<pathelement location="${lib}/jempbox-1.8.8" />
<pathelement location="${lib}/javax.servlet-api-3.1.0.jar" />
<pathelement location="${lib}/jetty-client-9.2.6.v20141205.jar" />
@ -204,7 +204,7 @@
<pathelement location="${lib}/jsch-0.1.51.jar" />
<pathelement location="${lib}/json-simple-1.1.1.jar" />
<pathelement location="${lib}/jsoup-1.8.1.jar" />
<pathelement location="${lib}/log4j-over-slf4j-1.7.2.jar" />
<pathelement location="${lib}/log4j-over-slf4j-1.7.9.jar" />
<pathelement location="${lib}/lucene-analyzers-common-4.10.2.jar" />
<pathelement location="${lib}/lucene-analyzers-phonetic-4.10.2.jar" />
<pathelement location="${lib}/lucene-classification-4.10.2.jar" />
@ -226,8 +226,8 @@
<pathelement location="${lib}/pdfbox-1.8.8.jar" />
<pathelement location="${lib}/poi-3.10.1.jar" />
<pathelement location="${lib}/poi-scratchpad-3.10.1.jar" />
<pathelement location="${lib}/slf4j-api-1.7.6.jar" />
<pathelement location="${lib}/slf4j-jdk14-1.7.2.jar" />
<pathelement location="${lib}/slf4j-api-1.7.9.jar" />
<pathelement location="${lib}/slf4j-jdk14-1.7.9.jar" />
<pathelement location="${lib}/solr-core-4.10.2.jar" />
<pathelement location="${lib}/solr-solrj-4.10.2.jar" />
<pathelement location="${lib}/spatial4j-0.4.1.jar" />

2
htroot/ConfigHeuristics_p.html
Unescape View File

@ -129,7 +129,7 @@
The task is started in the background. It may take some minutes before new entries appear (after refreshing the page).
Alternatively you may <a href="?copydefaultosdconfig=">copy &amp; paste a example config file</a> located in <i>defaults/heuristicopensearch.conf</i> to the DATA/SETTINGS directory.
For the discover function the <i>web graph</i> option of the web structure index and the fields <i>target_rel_s, target_protocol_s, target_urlstub_s</i> have to be switched on in the <a href="IndexSchema_p.html?core=webgraph">webgraph Solr schema</a>.
#{osdsolrfieldswitch}#<input type="submit" name="switchsolrfieldson" value="switch Solr fields on" class="btn btn-primary" onclick="return confirm('modify Solr Schema')"/>#{/osdsolrfieldswitch}#
#{osdsolrfieldswitch}#<input type="submit" name="switchsolrfieldson" value="switch Solr fields on" class="btn btn-primary btn-xs" onclick="return confirm('modify Solr Schema')"/>#{/osdsolrfieldswitch}#
</div>
</form>
</fieldset>

2
htroot/ConfigPortal.html
Unescape View File

@ -66,7 +66,7 @@
<dt>Greedy Learning Mode</dt>
<dd>
<input type="checkbox" name="greedylearning.active" value="true" #(greedylearning.active)#::checked="checked"#(/greedylearning.active)# />load documents linked in search results, will be deactivated automatically when index size &gt; #[greedylearning.limit.doccount]#
<input type="checkbox" name="greedylearning.active" value="true" #(greedylearning.active)#::checked="checked"#(/greedylearning.active)# />load documents linked in search results, will be deactivated automatically when index size &gt; #[greedylearning.limit.doccount]# <small> (see <a href="ConfigHeuristics_p.html">Heuristics: search-result</a> to use this permanent)</small>
</dd>
<dt>Default Pop-Up Page</dt>

2
htroot/ConfigPortal.java
Unescape View File

@ -219,7 +219,7 @@ public class ConfigPortal {
prop.put("target_selected_special_searchresult", "searchresult".equals(target_special) ? 1 : 0);
prop.put("target_special_pattern", sb.getConfig(SwitchboardConstants.SEARCH_TARGET_SPECIAL_PATTERN, ""));
String myaddress = (sb.peers == null) ? null : sb.peers.mySeed() == null ? null : sb.peers.mySeed().getPublicAddress(sb.peers.mySeed().getIP());
String myaddress = (sb.peers == null) || sb.peers.mySeed() == null || sb.peers.mySeed().getIP() == null ? null : sb.peers.mySeed().getPublicAddress(sb.peers.mySeed().getIP());
if (myaddress == null) {
myaddress = "localhost:" + sb.getLocalPort("port", 8090);
}

1
htroot/ViewLog_p.java
Unescape View File

@ -102,6 +102,7 @@ public class ViewLog_p {
int level = 0;
int lc = 0;
for (final String logLine : log) {
if (logLine == null) break;
final String nextLogLine = logLine.trim();
if (filterMatcher != null) {

2
htroot/yacy/hello.java
Unescape View File

@ -169,7 +169,7 @@ public final class hello {
time_backping = System.currentTimeMillis() - time;
backping_method = "reportedip=" + reportedip;
if (callback[0] >= 0) { success = true; break; }
if (callbackRemain-- <= 0) break; // no more tries left / restrict to a limited number of ips
if (--callbackRemain <= 0) break; // no more tries left / restrict to a limited number of ips
}
}
}

BIN
lib/commons-fileupload-1.2.2.jar
View File

Binary file not shown.

0
lib/commons-fileupload-1.2.2.License → lib/commons-fileupload-1.3.1.License
Unescape View File

BIN
lib/commons-fileupload-1.3.1.jar
View File

Binary file not shown.

BIN
lib/jcl-over-slf4j-1.7.2.jar
View File

Binary file not shown.

BIN
lib/jcl-over-slf4j-1.7.9.jar
View File

Binary file not shown.

BIN
lib/log4j-over-slf4j-1.7.2.jar
View File

Binary file not shown.

BIN
lib/log4j-over-slf4j-1.7.9.jar
View File

Binary file not shown.

BIN
lib/slf4j-api-1.7.6.jar
View File

Binary file not shown.

BIN
lib/slf4j-api-1.7.9.jar
View File

Binary file not shown.

BIN
lib/slf4j-jdk14-1.7.2.jar → lib/slf4j-jdk14-1.7.9.jar
View File

Binary file not shown.

2
nbproject/project.xml
Unescape View File

@ -83,7 +83,7 @@
<compilation-unit>
<package-root>source</package-root>
<package-root>htroot</package-root>
<classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/commons-codec-1.9.jar;lib/commons-compress-1.8.1.jar;lib/commons-fileupload-1.2.2.jar;lib/commons-io-2.3.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.8.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.3.6.jar;lib/httpcore-4.3.3.jar;lib/httpmime-4.3.6.jar;lib/icu4j-core.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.2.jar;lib/jempbox-1.8.8.jar;lib/jetty-client-9.2.6.v20141205.jar;lib/jetty-continuation-9.2.6.v20141205.jar;lib/jetty-deploy-9.2.6.v20141205.jar;lib/jetty-http-9.2.6.v20141205.jar;lib/jetty-io-9.2.6.v20141205.jar;lib/jetty-jmx-9.2.6.v20141205.jar;lib/jetty-proxy-9.2.6.v20141205.jar;lib/jetty-security-9.2.6.v20141205.jar;lib/jetty-server-9.2.6.v20141205.jar;lib/jetty-servlet-9.2.6.v20141205.jar;lib/jetty-servlets-9.2.6.v20141205.jar;lib/jetty-util-9.2.6.v20141205.jar;lib/jetty-webapp-9.2.6.v20141205.jar;lib/jetty-xml-9.2.6.v20141205.jar;lib/jsch-0.1.51.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.1.jar;lib/log4j-over-slf4j-1.7.2.jar;lib/lucene-analyzers-common-4.10.2.jar;lib/lucene-analyzers-phonetic-4.10.2.jar;lib/lucene-classification-4.10.2.jar;lib/lucene-codecs-4.10.2.jar;lib/lucene-core-4.10.2.jar;lib/lucene-facet-4.10.2.jar;lib/lucene-grouping-4.10.2.jar;lib/lucene-highlighter-4.10.2.jar;lib/lucene-join-4.10.2.jar;lib/lucene-memory-4.10.2.jar;lib/lucene-misc-4.10.2.jar;lib/lucene-queries-4.10.2.jar;lib/lucene-queryparser-4.10.2.jar;lib/lucene-spatial-4.10.2.jar;lib/lucene-suggest-4.10.2.jar;lib/metadata-extractor-2.7.0.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.8.jar;lib/poi-3.10.1.jar;lib/poi-scratchpad-3.10.1.jar;lib/slf4j-api-1.7.6.jar;lib/slf4j-jdk14-1.7.2.jar;lib/solr-core-4.10.2.jar;lib/solr-solrj-4.10.2.jar;lib/spatial4j-0.4.1.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.2.jar;lib/wstx-asl-3.2.9.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar</classpath>
<classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/commons-codec-1.9.jar;lib/commons-compress-1.8.1.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.3.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.8.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.3.6.jar;lib/httpcore-4.3.3.jar;lib/httpmime-4.3.6.jar;lib/icu4j-core.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.9.jar;lib/jempbox-1.8.8.jar;lib/jetty-client-9.2.6.v20141205.jar;lib/jetty-continuation-9.2.6.v20141205.jar;lib/jetty-deploy-9.2.6.v20141205.jar;lib/jetty-http-9.2.6.v20141205.jar;lib/jetty-io-9.2.6.v20141205.jar;lib/jetty-jmx-9.2.6.v20141205.jar;lib/jetty-proxy-9.2.6.v20141205.jar;lib/jetty-security-9.2.6.v20141205.jar;lib/jetty-server-9.2.6.v20141205.jar;lib/jetty-servlet-9.2.6.v20141205.jar;lib/jetty-servlets-9.2.6.v20141205.jar;lib/jetty-util-9.2.6.v20141205.jar;lib/jetty-webapp-9.2.6.v20141205.jar;lib/jetty-xml-9.2.6.v20141205.jar;lib/jsch-0.1.51.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.1.jar;lib/log4j-over-slf4j-1.7.9.jar;lib/lucene-analyzers-common-4.10.2.jar;lib/lucene-analyzers-phonetic-4.10.2.jar;lib/lucene-classification-4.10.2.jar;lib/lucene-codecs-4.10.2.jar;lib/lucene-core-4.10.2.jar;lib/lucene-facet-4.10.2.jar;lib/lucene-grouping-4.10.2.jar;lib/lucene-highlighter-4.10.2.jar;lib/lucene-join-4.10.2.jar;lib/lucene-memory-4.10.2.jar;lib/lucene-misc-4.10.2.jar;lib/lucene-queries-4.10.2.jar;lib/lucene-queryparser-4.10.2.jar;lib/lucene-spatial-4.10.2.jar;lib/lucene-suggest-4.10.2.jar;lib/metadata-extractor-2.7.0.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.8.jar;lib/poi-3.10.1.jar;lib/poi-scratchpad-3.10.1.jar;lib/slf4j-api-1.7.9.jar;lib/slf4j-jdk14-1.7.9.jar;lib/solr-core-4.10.2.jar;lib/solr-solrj-4.10.2.jar;lib/spatial4j-0.4.1.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.2.jar;lib/wstx-asl-3.2.9.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar</classpath>
<built-to>lib/yacycore.jar</built-to>
<source-level>1.7</source-level>
</compilation-unit>

10
pom.xml
Unescape View File

@ -329,7 +329,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3</version>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>commons-jxpath</groupId>
@ -404,7 +404,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.2</version>
<version>1.7.9</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
@ -434,7 +434,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.7.2</version>
<version>1.7.9</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
@ -519,12 +519,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.2</version>
<version>1.7.9</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.7.2</version>
<version>1.7.9</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>

10
source/net/yacy/cora/lod/vocabulary/Tagging.java
Unescape View File

@ -208,7 +208,9 @@ public class Tagging {
String[] tags;
int p;
String line;
Pattern kommapattern = Pattern.compile(",");
try {
String[] pl;
vocloop: while ((line = list.take()) != Files.POISON_LINE) {
line = line.trim();
p = line.indexOf('#');
@ -226,10 +228,8 @@ public class Tagging {
continue vocloop;
}
}
String[] pl = parseLine(line);
if (pl == null) {
continue vocloop;
}
pl = parseLine(line);
if (pl == null) continue vocloop;
if (pl[1] == null) {
term = normalizeKey(pl[0]);
v = normalizeTerm(pl[0]);
@ -240,7 +240,7 @@ public class Tagging {
}
term = normalizeKey(pl[0]);
v = pl[1];
tags = v.split(",");
tags = kommapattern.split(v);
Set<String> synonyms = new HashSet<String>();
synonyms.add(term);
tagloop: for (String synonym: tags) {

5
source/net/yacy/http/ProxyHandler.java
Unescape View File

@ -225,7 +225,10 @@ public class ProxyHandler extends AbstractRemoteHandler implements Handler {
convertHeaderToJetty(clientresponse, response);
response.setStatus(statusCode);
client.writeTo(response.getOutputStream());
if (statusCode == HttpServletResponse.SC_OK) { // continue to serve header to client e.g. HttpStatus = 302 (while skiping content)
client.writeTo(response.getOutputStream()); // may throw exception on httpStatus=302 while gzip encoded inputstream
}
}
} catch (final SocketException se) {
throw new ServletException("Socket Exception: " + se.getMessage());

6
source/net/yacy/server/http/HTTPDProxyHandler.java
Unescape View File

@ -66,6 +66,7 @@ import java.util.logging.FileHandler;
import java.util.logging.Level;
import java.util.logging.LogManager;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletResponse;
import net.yacy.cora.document.id.DigestURL;
import net.yacy.cora.protocol.ClientIdentification;
@ -572,8 +573,9 @@ public final class HTTPDProxyHandler {
" StoreHTCache=" + storeHTCache +
" SupportError=" + supportError);
// FileUtils.copy(res.getDataAsStream(), outStream);
client.writeTo(outStream);
if (statusCode == HttpServletResponse.SC_OK) { // continue to serve header to client e.g. HttpStatus = 302 (while skiping content)
client.writeTo(outStream); // may throw exception on httpStatus=302 while gzip encoded inputstream
}
conProp.put(HeaderFramework.CONNECTION_PROP_PROXY_RESPOND_CODE,"TCP_MISS");
}

Write Preview
Loading…
Cancel
Save