--- trunk2/import_xml/isis_hidra_ths.xml 2004/10/29 22:05:51 554 +++ trunk2/import_xml/isis_hidra_ths.xml 2004/10/29 22:09:04 555 @@ -58,15 +58,15 @@ eval{"v901^a" eq "Deskriptor"}v250^a - eval{"v901^a" eq "Deskriptor"}v450^a - eval{"v901^a" eq "Deskriptor"}v330^a + eval{"s901^a" eq "Deskriptor"}v450^a + eval{"s901^a" eq "Deskriptor"}v330^a eval{"v901^a" eq "Deskriptor"}v250^a / [v562^4] v562^a eval{"v901^a" eq "Deskriptor"}filter{CROVOC}v800 - eval{qq#v450^a#}v450^a >> v250^a / [v562^4] v562^a - eval{qq#v450^a#}filter{CROVOC}v800 + eval{qq#v450^a#}v450^a >> s250^a / [s562^4] s562^a + eval{qq#v450^a#}filter{CROVOC}s800 [v251] v250^a @@ -162,10 +162,12 @@ - eval{"v901^a" eq "Deskriptor"}v258^a v458^a v338^a + eval{"v901^a" eq "Deskriptor"}v258^a + eval{"s901^a" eq "Deskriptor"}v458^a + eval{"s901^a" eq "Deskriptor"}v338^a eval{"v901^a" eq "Deskriptor"}v258^a / [v572^4] v572^a - eval{"v901^a" eq "Deskriptor"}v458^a >> v258^a / [v572^4] v572^a - eval{"v901^a" eq "Deskriptor"}filter{CROVOC}v800 + eval{qq#v458^a#}v458^a >> s258^a / [s572^4] s572^a + eval{qq#v458^a#}filter{CROVOC}s800 v258^a @@ -202,10 +204,11 @@ - eval{"v901^a" eq "Deskriptor"}v253 v453 - eval{"v901^a" eq "Deskriptor"}v253^a / [v574^4] v574^a - eval{"v901^a" eq "Deskriptor"}v453^a >> v253^a / [v574^4] v574^a - eval{"v901^a" eq "Deskriptor"}filter{CROVOC}v800 + eval{"v901^a" eq "Deskriptor"}v253^a + eval{"s901^a" eq "Deskriptor"}v453^a + eval{"v901^a" eq "Deskriptor"}v253^a / [v572^4] v572^a + eval{qq#v453^a#}v453^a >> s253^a / [s572^4] s572^a + eval{qq#v453^a#}filter{CROVOC}s800 v253^a @@ -231,10 +234,11 @@ - eval{"v901^a" eq "Deskriptor"}v254 v454 - eval{"v901^a" eq "Deskriptor"}v254^a / [v576^4] v576^a - eval{"v901^a" eq "Deskriptor"}v454^a >> v254^a / [v576^4] v576^a - eval{"v901^a" eq "Deskriptor"}filter{CROVOC}v800 + eval{"v901^a" eq "Deskriptor"}v254^a + eval{"s901^a" eq "Deskriptor"}v454^a + eval{"v901^a" eq "Deskriptor"}v254^a / [v572^4] v572^a + eval{qq#v454^a#}v454^a >> s254^a / [s572^4] s572^a + eval{qq#v454^a#}filter{CROVOC}s800 v254^a