Commit 11f9e8bfe684f0cc32823ef307b09c37fd6771ae

Authored by Matthijs Brouwer
1 parent e34c5daf

fixes

docker/Dockerfile
1 1 # Automatically generated Dockerfile
2   -# - Build 2017-01-02 10:20
  2 +# - Build 2017-01-02 14:26
3 3 # - Lucene/Solr version 6.3.0
4 4 # - Mtas release 20170102
5 5 #
... ... @@ -55,7 +55,7 @@ RUN apt-get update && apt-get install -y lsof software-properties-common python-
55 55 && chmod -R 755 /var/www/html \
56 56 && printf "echo\n" >> /start.sh \
57 57 && printf "echo \"================ Mtas -- Multi Tier Annotation Search =================\"\n" >> /start.sh \
58   -&& printf "echo \" Timestamp 2017-01-02 10:20\"\n" >> /start.sh \
  58 +&& printf "echo \" Timestamp 2017-01-02 14:26\"\n" >> /start.sh \
59 59 && printf "echo \" Lucene/Solr version 6.3.0\"\n" >> /start.sh \
60 60 && printf "echo \" Mtas release 20170102\"\n" >> /start.sh \
61 61 && printf "echo \" See https://meertensinstituut.github.io/mtas/ for more information\"\n" >> /start.sh \
... ...
src/mtas/analysis/MtasTokenizer.java
... ... @@ -173,7 +173,6 @@ public final class MtasTokenizer<T> extends Tokenizer {
173 173 throw new IOException(
174 174 e.getClass().getSimpleName() + ": " + e.getMessage());
175 175 }
176   -
177 176 }
178 177  
179 178 /**
... ...
src/mtas/analysis/parser/MtasBasicParser.java
... ... @@ -1075,6 +1075,7 @@ abstract public class MtasBasicParser extends MtasParser {
1075 1075 "variable " + decodedVariableName + " unknown");
1076 1076 }
1077 1077 } catch (UnsupportedEncodingException e) {
  1078 + e.printStackTrace();
1078 1079 // do nothing
1079 1080 }
1080 1081 } else {
... ... @@ -1084,11 +1085,13 @@ abstract public class MtasBasicParser extends MtasParser {
1084 1085 try {
1085 1086 decoded = decoded + new String(dec.decode(split), "UTF-8");
1086 1087 } catch (UnsupportedEncodingException e) {
  1088 + e.printStackTrace();
1087 1089 // do nothing
1088 1090 } catch (IllegalArgumentException e) {
  1091 + e.printStackTrace();
1089 1092 // do nothing
1090 1093 // System.out.println("Probleem "+split+" - "+e.getMessage());
1091   - e.printStackTrace();
  1094 + //e.printStackTrace();
1092 1095 }
1093 1096 }
1094 1097 }
... ... @@ -1166,7 +1169,7 @@ abstract public class MtasBasicParser extends MtasParser {
1166 1169 return true;
1167 1170 } catch (MtasParserException e) {
1168 1171 // do nothing
1169   - System.out.println(e.getMessage());
  1172 + //System.out.println(e.getMessage());
1170 1173 }
1171 1174 }
1172 1175 return false;
... ...
src/mtas/analysis/token/MtasTokenIdFactory.java
... ... @@ -12,7 +12,7 @@ public final class MtasTokenIdFactory {
12 12 * Instantiates a new mtas token id factory.
13 13 */
14 14 public MtasTokenIdFactory() {
15   - tokenId = -1;
  15 + tokenId = 0;
16 16 }
17 17  
18 18 /**
... ...
src/mtas/codec/MtasCodecPostingsFormat.java
... ... @@ -223,7 +223,8 @@ public class MtasCodecPostingsFormat extends PostingsFormat {
223 223 MtasToken<String> token = null;
224 224 try {
225 225 inObject.seek(ref);
226   - token = new MtasTokenString(inObject.readVInt(), "");
  226 + token = new MtasTokenString(null, "");
  227 + token.setId(inObject.readVInt());
227 228 token.setTokenRef(ref);
228 229 int objectFlags = inObject.readVInt();
229 230 int[] positions = null;
... ...
src/mtas/codec/MtasFieldsConsumer.java
... ... @@ -1258,6 +1258,7 @@ public class MtasFieldsConsumer extends FieldsConsumer {
1258 1258 } catch (IOException e) {
1259 1259 // ignore, can happen when merging segment already written by
1260 1260 // delegateFieldsConsumer
  1261 + e.printStackTrace();
1261 1262 } finally {
1262 1263 IOUtils.closeWhileHandlingException(closeables);
1263 1264 try {
... ... @@ -1416,6 +1417,7 @@ public class MtasFieldsConsumer extends FieldsConsumer {
1416 1417 }
1417 1418 return mtasId;
1418 1419 } catch (Exception e) {
  1420 + e.printStackTrace();
1419 1421 throw new IOException(e.getMessage());
1420 1422 }
1421 1423 }
... ...
src/mtas/solr/update/processor/MtasUpdateRequestProcessorFactory.java
... ... @@ -172,7 +172,6 @@ public class MtasUpdateRequestProcessorFactory
172 172 } catch (ClassNotFoundException | InstantiationException
173 173 | IllegalAccessException | IllegalArgumentException
174 174 | InvocationTargetException | NoSuchMethodException e) {
175   - e.printStackTrace();
176 175 throw new IOException(e.getMessage());
177 176 }
178 177 } else {
... ... @@ -216,8 +215,7 @@ public class MtasUpdateRequestProcessorFactory
216 215 } catch (ClassNotFoundException | InstantiationException
217 216 | IllegalAccessException | IllegalArgumentException
218 217 | InvocationTargetException | NoSuchMethodException e) {
219   - e.printStackTrace();
220   - throw new IOException(e.getMessage());
  218 + throw new IOException(e.getMessage());
221 219 }
222 220 } else {
223 221 throw new IOException("no className");
... ...
src/mtas/solr/update/processor/MtasUpdateRequestProcessorResultWriter.java
... ... @@ -107,7 +107,7 @@ public class MtasUpdateRequestProcessorResultWriter implements Closeable {
107 107 if (!closed) {
108 108 objectOutputStream.close();
109 109 fileOutputStream.close();
110   - closed = true;
  110 + closed = true;
111 111 }
112 112 }
113 113  
... ...