Révision 2072
tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/Line.java (revision 2072) | ||
---|---|---|
306 | 306 |
} |
307 | 307 |
|
308 | 308 |
return LangFormater.format(StringUtils.join(words, wordSeparator), |
309 |
concordance.getCorpus().getLanguage()); //$NON-NLS-1$
|
|
309 |
concordance.getCorpus().getLang()); //$NON-NLS-1$ |
|
310 | 310 |
} |
311 | 311 |
|
312 | 312 |
/** |
... | ... | |
356 | 356 |
currentPos++; // next position |
357 | 357 |
} |
358 | 358 |
return LangFormater.format(StringUtils.join(words, wordSeparator), |
359 |
concordance.getCorpus().getLanguage()); //$NON-NLS-1$
|
|
359 |
concordance.getCorpus().getLang()); //$NON-NLS-1$ |
|
360 | 360 |
} |
361 | 361 |
|
362 | 362 |
/** |
... | ... | |
405 | 405 |
currentPos++; |
406 | 406 |
} |
407 | 407 |
return LangFormater.format(StringUtils.join(words, wordSeparator), |
408 |
concordance.getCorpus().getLanguage());
|
|
408 |
concordance.getCorpus().getLang()); |
|
409 | 409 |
} |
410 | 410 |
|
411 | 411 |
/** The properties to process. */ |
... | ... | |
439 | 439 |
words.add(StringUtils.join(word, "_")); //$NON-NLS-1$ |
440 | 440 |
} |
441 | 441 |
return LangFormater.format(StringUtils.join(words, " "), //$NON-NLS-1$ |
442 |
concordance.getCorpus().getLanguage()); //$NON-NLS-1$
|
|
442 |
concordance.getCorpus().getLang()); //$NON-NLS-1$ |
|
443 | 443 |
} |
444 | 444 |
|
445 | 445 |
/** |
... | ... | |
467 | 467 |
words.add(StringUtils.join(word, wordSeparator)); |
468 | 468 |
} |
469 | 469 |
return LangFormater.format(StringUtils.join(words, wordSeparator), |
470 |
concordance.getCorpus().getLanguage()); //$NON-NLS-1$
|
|
470 |
concordance.getCorpus().getLang()); //$NON-NLS-1$ |
|
471 | 471 |
} |
472 | 472 |
|
473 | 473 |
/** |
... | ... | |
494 | 494 |
} |
495 | 495 |
|
496 | 496 |
return LangFormater.format(StringUtils.join(words, " "), //$NON-NLS-1$ |
497 |
concordance.getCorpus().getLanguage()); //$NON-NLS-1$
|
|
497 |
concordance.getCorpus().getLang()); //$NON-NLS-1$ |
|
498 | 498 |
} |
499 | 499 |
|
500 | 500 |
/** |
tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/handlers/ComputeWordCloud.java (revision 2072) | ||
---|---|---|
73 | 73 |
if (selection instanceof CQPCorpus) { |
74 | 74 |
try { |
75 | 75 |
CQPCorpus corpus = (CQPCorpus) selection; |
76 |
String lang = corpus.getLanguage();
|
|
76 |
String lang = corpus.getLang(); |
|
77 | 77 |
CQLQuery query; |
78 | 78 |
if (corpus.getProperty(lang + "pos") != null) { //$NON-NLS-1$ |
79 | 79 |
query = new CQLQuery(WordCloud.getQueryForLang(lang)); |
tmp/org.txm.para.core/src/org/txm/para/core/functions/ParaBrowser.java (revision 2072) | ||
---|---|---|
214 | 214 |
return new Pair<String, QueryResult>("error", null); |
215 | 215 |
} |
216 | 216 |
return new Pair<String, QueryResult>(LangFormater.format(text, corpus |
217 |
.getLanguage()), result);
|
|
217 |
.getLang()), result); |
|
218 | 218 |
} |
219 | 219 |
// return keywordsViewPropValues; |
220 | 220 |
return new Pair<String, QueryResult>("error no property", null); |
tmp/org.txm.rcp.feature/build.properties (revision 2072) | ||
---|---|---|
6 | 6 |
root.folder.redist/css=../org.txm.core/res/org/txm/css/ |
7 | 7 |
root.macosx.cocoa.x86_64=mac/ |
8 | 8 |
root=../org.txm.setups/shared/all |
9 |
root.linux.gtk.x86_64.permissions.755=jre/bin/java,plugins/org.txm.libs.cqp.linux/res/linux32/,plugins/org.txm.libs.cqp.linux/res/linux64/ |
|
9 |
root.linux.gtk.x86_64.permissions.755=jre/bin/java,plugins/org.txm.libs.cqp.linux/res/linux32/,plugins/org.txm.libs.cqp.linux/res/linux64/,plugins/org.txm.statsengine.r.core.linux/res/linux64/bin
|
|
10 | 10 |
root.linux.gtk.x86_64=linux/ |
11 |
root.macosx.cocoa.x86_64.permissions.755=jre/bin/java,plugins/org.txm.libs.cqp.macosx/res/macosx/ |
|
11 |
root.macosx.cocoa.x86_64.permissions.755=jre/bin/java,plugins/org.txm.libs.cqp.macosx/res/macosx/,plugins/org.txm.statsengine.r.core.macosx/res/macosx/bin
|
|
12 | 12 |
qualifier=svn |
tmp/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java (revision 2072) | ||
---|---|---|
37 | 37 |
import java.util.List; |
38 | 38 |
import java.util.Locale; |
39 | 39 |
|
40 |
import org.apache.commons.lang.StringUtils; |
|
40 | 41 |
import org.eclipse.osgi.util.NLS; |
41 | 42 |
import org.txm.Toolbox; |
42 | 43 |
import org.txm.core.messages.TXMCoreMessages; |
... | ... | |
304 | 305 |
// counts |
305 | 306 |
buff.append("<ul>\n"); //$NON-NLS-1$ |
306 | 307 |
buff.append("<li>" + NLS.bind(PropertiesCoreMessages.numberOfWordsP0, numberOfWords) + "</li>\n"); //$NON-NLS-1$ //$NON-NLS-2$ |
307 |
buff.append("<li>" + PropertiesCoreMessages.numberOfWordProperties + (NProperties - 1) + "</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$ |
|
308 |
buff.append("<li>" + PropertiesCoreMessages.numberOfStructuralUnits + NStructures + "</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$ |
|
308 |
buff.append("<li>" + PropertiesCoreMessages.numberOfWordProperties + (NProperties - 1) + "("+StringUtils.join(properties, ", ")+")</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$
|
|
309 |
buff.append("<li>" + PropertiesCoreMessages.numberOfStructuralUnits + NStructures + "("+StringUtils.join(structures, ", ")+")</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$
|
|
309 | 310 |
buff.append("</ul>\n"); //$NON-NLS-1$ |
310 | 311 |
|
311 | 312 |
// Propriétés d'occurrences |
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java (revision 2072) | ||
---|---|---|
210 | 210 |
*/ |
211 | 211 |
protected String lang = null; |
212 | 212 |
|
213 |
/** The language. */ |
|
214 |
protected String language = "???"; //$NON-NLS-1$ |
|
215 |
|
|
216 | 213 |
/** The corpus lexical units properties. */ |
217 | 214 |
protected List<WordProperty> lexicalUnitsProperties; |
218 | 215 |
|
... | ... | |
454 | 451 |
|
455 | 452 |
charset = "latin1"; //$NON-NLS-1$ |
456 | 453 |
lang = null; |
457 |
language = "???"; //$NON-NLS-1$ |
|
458 | 454 |
lexicalUnitsProperties = null; |
459 | 455 |
size = -1; |
460 | 456 |
structuralUnits = null; |
... | ... | |
820 | 816 |
* @return the infos |
821 | 817 |
*/ |
822 | 818 |
public String getInfos() { |
823 |
return TXMCoreMessages.corpusColon + this.pID + TXMCoreMessages.encodingColon + getCharset() + TXMCoreMessages.languageColon + getLanguage();
|
|
819 |
return TXMCoreMessages.corpusColon + this.pID + TXMCoreMessages.encodingColon + getCharset() + TXMCoreMessages.languageColon + getLang(); |
|
824 | 820 |
} |
825 | 821 |
|
826 | 822 |
/** |
... | ... | |
828 | 824 |
* |
829 | 825 |
* @return the language |
830 | 826 |
*/ |
831 |
public String getLanguage() { |
|
832 |
return language; |
|
827 |
public String getLang() { |
|
828 |
getLocale(); |
|
829 |
return lang; |
|
833 | 830 |
} |
834 | 831 |
|
835 | 832 |
/** |
... | ... | |
1332 | 1329 |
* the new language |
1333 | 1330 |
*/ |
1334 | 1331 |
public void setLanguage(String corpusLanguage) { |
1335 |
this.language = corpusLanguage;
|
|
1332 |
this.lang = corpusLanguage; |
|
1336 | 1333 |
} |
1337 | 1334 |
} |
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/ComputeTXMResult.java (revision 2072) | ||
---|---|---|
25 | 25 |
public Object execute(ExecutionEvent event) throws ExecutionException { |
26 | 26 |
IWorkbenchPart part = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getActivePart(); |
27 | 27 |
IEditorPart activeEditor = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getActiveEditor(); |
28 |
System.out.println("A part="+part); |
|
29 |
System.out.println("A editor="+activeEditor); |
|
28 |
|
|
30 | 29 |
compute(event); |
31 | 30 |
// gets the main editor if the active editor is a multipages editor |
32 | 31 |
// if(part instanceof TXMMultiPageEditor) { |
... | ... | |
46 | 45 |
|
47 | 46 |
public static Object compute(ExecutionEvent event) { |
48 | 47 |
Object trigger = event.getTrigger(); |
49 |
System.out.println("TRIGGER="+trigger.getClass()); |
|
48 |
|
|
50 | 49 |
if (trigger instanceof Event) { |
51 | 50 |
Event e = (Event) trigger; |
52 | 51 |
if (e.widget instanceof ToolItem) { |
tmp/org.txm.setups/shared/mac/INSTALL (revision 2072) | ||
---|---|---|
71 | 71 |
say $SAY_CREATESTAMP |
72 | 72 |
echo "** TXM postinstall: create STAMP file" |
73 | 73 |
# Create STAMP |
74 |
rm "$TXMINSTALLDIR/STAMP" |
|
74 | 75 |
touch "$TXMINSTALLDIR/STAMP" |
75 | 76 |
|
76 | 77 |
if [ $? != 0 ];then |
... | ... | |
81 | 82 |
say $SAY_SETFILERIGHTS |
82 | 83 |
echo "** TXM postinstall: set rights" |
83 | 84 |
# Set executable files |
84 |
chmod +x "$TXMINSTALLDIR"/Contents/TXM/plugins/CQP.macosx*/res/macosx/* |
|
85 |
chmod +x "$TXMINSTALLDIR"/Contents/TXM/plugins/org.txm.libs.cqp.macosx*/res/macosx/* |
|
86 |
chmod -R +x "$TXMINSTALLDIR"/Contents/TXM/plugins/org.txm.statsengine.r.core.macosx*/res/macosx/* |
|
85 | 87 |
|
86 | 88 |
chmod -R +r "$TXMINSTALLDIR" |
87 | 89 |
chmod +rx "$TXMINSTALLDIR/Contents/MacOS/TXM" |
tmp/org.txm.setups/shared/mac/Applications/TXM.app/Contents/MacOS/TXM (revision 2072) | ||
---|---|---|
47 | 47 |
exit 1 |
48 | 48 |
fi |
49 | 49 |
|
50 |
STAMP=`stat -t %Y%m%d "/Applications/TXM-TXMVERSION.app/STAMP" | cut -d\ -f11`
|
|
50 |
STAMP=`stat -t %Y-%m-%d_%H:%M "/Applications/TXM-TXMVERSION.app/STAMP" | cut -d\ -f11`
|
|
51 | 51 |
|
52 | 52 |
if [ $? != 0 ]; then |
53 | 53 |
echo "TXM: Can't find STAMP file /Applications/TXM-TXMVERSION.app/STAMP $LOGFILES" |
54 | 54 |
exit 1 ; |
55 | 55 |
fi |
56 | 56 |
|
57 |
echo "TXM: if .txm folder does not contain the STAMP file, its a new install."
|
|
57 |
echo "TXM: if the $DOTTXMHOME/$STAMP STAMP file does not exists, its a new install."
|
|
58 | 58 |
if [ ! -e "$DOTTXMHOME/$STAMP" ]; then |
59 | 59 |
|
60 | 60 |
echo "New TXM install: it's the first launch after the installation" |
tmp/org.txm.core/src/java/org/txm/objects/CorpusBuild.java (revision 2072) | ||
---|---|---|
226 | 226 |
} |
227 | 227 |
return true; |
228 | 228 |
} |
229 |
|
|
230 |
/** |
|
231 |
* |
|
232 |
* @return the corpus language. Override this method to set another lang. eg for parallel corpus |
|
233 |
*/ |
|
234 |
public String getLang() { |
|
235 |
return getProject().getLang(); |
|
236 |
} |
|
229 | 237 |
|
230 | 238 |
// /** |
231 | 239 |
// * Adds the text. |
Formats disponibles : Unified diff