Révision 3679

TXM/trunk/bundles/org.txm.groovy.core/src/groovy/org/txm/macro/commands/CrossedPartitionBuilderMacro.groovy (revision 3679)
18 18

  
19 19
corpus = corpusViewSelection
20 20

  
21
@Field @Option(name="structuralUnit", usage="the structural Unit list separated with commas", widget="String", required=true, def="text")
22
def structuralUnit
21
@Field @Option(name="structuralUnitList", usage="the structural Unit list separated with commas", widget="String", required=true, def="text")
22
def structuralUnitList
23 23

  
24 24
@Field @Option(name="structuralUnitPropertiesList", usage="the structural Unit properties list separated with commas", widget="String", required=true, def="p1,p2")
25 25
def structuralUnitPropertiesList
......
58 58

  
59 59
def structuralUnits = []
60 60
def structuralUnitProperties = []
61
structuralUnit = structuralUnit.trim()
61
structuralUnitList = structuralUnitList.trim()
62 62
structuralUnitPropertiesList = structuralUnitPropertiesList.trim()
63 63

  
64 64
// Build lists
65
def split = structuralUnit.split(",")
65
def split = structuralUnitList.split(",")
66 66
def split2 = structuralUnitPropertiesList.split(",")
67 67
if (split.size() == 1) {
68 68
	for (String p : split2) {
69 69
		p = p.trim();
70
		structuralUnits << structuralUnit
70
		structuralUnits << structuralUnitList
71 71
		structuralUnitProperties << p
72 72
	}
73 73
} else {
......
80 80
		}
81 81
	} else {
82 82
		println "Error: structuralUnitList size is different from structuralUnitPropertiesList"
83
		println "structuralUnitList=structuralUnitList=$structuralUnit structuralUnitPropertiesList=$structuralUnitPropertiesList"
83
		println "structuralUnitList=structuralUnitList=$structuralUnitList structuralUnitPropertiesList=$structuralUnitPropertiesList"
84 84
		return false
85 85
	}
86 86
}

Formats disponibles : Unified diff