Révision 1684

tmp/TXMReleasePlugins.site/site.xml (revision 1684)
3 3
   <description name="TXM Extensions - RELEASE" url="http://txm.textometrie.org/updates/plugins">
4 4
      This update site contains the Release plugins for TXM
5 5
   </description>
6
   <feature url="features/org.txm.backtomedia.feature_1.0.0.1674.jar" id="org.txm.backtomedia.feature" version="1.0.0.1674">
6
   <feature url="features/org.txm.backtomedia.feature_1.0.0.1680.jar" id="org.txm.backtomedia.feature" version="1.0.0.1680">
7 7
      <category name="Commands"/>
8 8
   </feature>
9
   <feature url="features/org.txm.wordcloud.feature_1.0.0.1674.jar" id="org.txm.wordcloud.feature" version="1.0.0.1674">
9
   <feature url="features/org.txm.wordcloud.feature_1.0.0.1680.jar" id="org.txm.wordcloud.feature" version="1.0.0.1680">
10 10
      <category name="Commands"/>
11 11
   </feature>
12
   <feature url="features/org.txm.treetagger.binaries.feature_1.0.0.1674.jar" id="org.txm.treetagger.binaries.feature" version="1.0.0.1674" os="" ws="">
12
   <feature url="features/org.txm.treetagger.binaries.feature_1.0.0.1680.jar" id="org.txm.treetagger.binaries.feature" version="1.0.0.1680" os="" ws="">
13 13
      <category name="Annotation"/>
14 14
   </feature>
15
   <feature url="features/org.txm.treetagger.models.feature_1.0.0.1674.jar" id="org.txm.treetagger.models.feature" version="1.0.0.1674">
15
   <feature url="features/org.txm.treetagger.models.feature_1.0.0.1680.jar" id="org.txm.treetagger.models.feature" version="1.0.0.1680">
16 16
      <category name="Annotation"/>
17 17
   </feature>
18
   <feature url="features/org.txm.annotation.urs.feature_1.0.0.1674.jar" id="org.txm.annotation.urs.feature" version="1.0.0.1674">
18
   <feature url="features/org.txm.annotation.urs.feature_1.0.0.1680.jar" id="org.txm.annotation.urs.feature" version="1.0.0.1680">
19 19
      <category name="Annotation"/>
20 20
   </feature>
21
   <feature url="features/org.txm.tigersearch.feature_1.0.0.1674.jar" id="org.txm.tigersearch.feature" version="1.0.0.1674">
21
   <feature url="features/org.txm.tigersearch.feature_1.0.0.1680.jar" id="org.txm.tigersearch.feature" version="1.0.0.1680">
22 22
      <category name="Annotation"/>
23 23
   </feature>
24 24
   <category-def name="Commands" label="Commands"/>
tmp/org.txm.core/src/java/org/txm/importer/AddAttributeInXml.java (revision 1684)
83 83
			result = true;;
84 84
			if (attributes != null) {
85 85
				for (Pair<String, String> meta : attributes) {
86
					if(stopAtFirst)
86
					if (stopAtFirst)
87 87
						stopInsertion = true;
88
					if(!exists.contains(meta.getFirst())) // I can add the new attribute
88
					if (!exists.contains(meta.getFirst())) // I can add the new attribute
89 89
						writer.writeAttribute(meta.getFirst(), meta.getSecond());
90 90
				}
91 91
			} else if (attributesMap != null) {
tmp/org.txm.core/src/java/org/txm/importer/StaxIdentityParser.java (revision 1684)
116 116
		writer.writeStartDocument("UTF-8", "1.0");
117 117
		writer.writeCharacters("\n");
118 118
		boolean ret = process(writer);
119
		if (writer != null) { // process from a file
119
		if (writer != null) {
120 120
			writer.close();
121 121
		}
122
		if (output != null) { // process from a file
123
			//	output.flush()
124
			output.close();
122
		if (output != null) {
123
			try {output.close();} catch(Exception e){System.out.println("output excep: "+e);}
125 124
		}
126 125

  
127 126
		if (parser != null) {
128
			try {parser.close();} catch(Exception e){System.out.println("parser exep: "+e); return false;}
127
			try {parser.close();} catch(Exception e){System.out.println("parser excep: "+e);}
129 128
		}
129
		
130
		if (inputData != null) {
131
			try {inputData.close();} catch(Exception e){System.out.println("inputData excep: "+e);}
132
		}
130 133

  
131 134
		return ret;
132 135
	}
tmp/org.txm.rcp.feature/win/TXM.bat (revision 1684)
45 45
copy "%DOTTXM%.metadata\.plugins\org.eclipse.core.runtime\.settings\org.txm.rcpapplication.prefs" "%temp%\org.txm.rcpapplication.prefs" 
46 46
copy "%DOTTXM%data\.metadata\.plugins\org.eclipse.core.runtime\.settings\org.txm.rcpapplication.prefs" "%temp%\org.txm.rcpapplication.prefs" 
47 47

  
48
rmdir "%DOTTXM%" /s /q
49
IF errorlevel 1 (echo "TXM: failed to delete %DOTTXM% directory.")
48
rmdir /s /q "%DOTTXM%"
49
IF errorlevel 1 (echo "TXM: failed to delete the %DOTTXM% directory.")
50 50

  
51 51
mkdir "%DOTTXM%" 
52 52
IF errorlevel 1 (echo "TXM: failed to create %DOTTXM% directory.")
......
62 62
mkdir "%DOTTXM%data" 
63 63
IF errorlevel 1 (echo "TXM: failed to create %DOTTXM%data directory.")
64 64

  
65
rmdir "%TXMHOME%corpora\.metadata"
65
rmdir /s /q "%TXMHOME%corpora\.metadata"
66
IF errorlevel 1 (echo "TXM: failed to delete the %TXMHOME%corpora\.metadata directory.")
66 67

  
67 68
copy "%installdir%STAMP" "%DOTTXM%STAMP" 
68 69
IF errorlevel 1 (echo "TXM: failed to copy %DOTTXM%STAMP file")

Formats disponibles : Unified diff