Merge branch 'master' of github.com:nkallen/pseudw

Conflicts: .gitmodules lib/annotated_edition.coffee test/annotated_edition.coffee vendor/canonical
nkallen · Sep 6, 2013 · cf9dfd1 · cf9dfd1
2 parents dadab57 + 03dcaaa
commit cf9dfd1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/lib/annotated_edition.coffee b/lib/annotated_edition.coffee
@@ -44,7 +44,11 @@ class AnnotatedEdition
         element = document.createElement('annotation', annotation.form)
         element.annotation = annotation
         parent.appendChild(element) if parent
+<<<<<<< HEAD:lib/annotated_edition.coffee
       null # no accumulator, since text nodes have no children
+=======
+      null # no accumulator, as text nodes have no children
+>>>>>>> 03dcaaafb7bad329e876e35d83efa21362b0ff09:lib/annotated_edition.coffee
     else
       attributes = {}
       for attr in child.attrs()

diff --git a/lib/annotator.coffee b/lib/annotator.coffee
@@ -36,6 +36,7 @@ class TreebankAnnotator extends Annotator
 
     annotation = @treebank[@i]
     form = annotation.originalForm || annotation.form
+    console.log(string[0...form.length], form)
     return [null, string] if (original = string[0...form.length]) != form
     @skip()
     remainder = string[form.length..]

diff --git a/test/annotated_edition.coffee b/test/annotated_edition.coffee
@@ -12,10 +12,20 @@ describe 'AnnotatedEdition', ->
   citationMapping = [{label: 'book'}, {label: 'line'}]
   annotator = new annotator.SimpleAnnotator
 
+<<<<<<< HEAD
   it 'selects a passage with a coarse selector', ->
     annotatedEdition = AnnotatedEdition.make(citationMapping, '2', annotator, document)
     annotatedEdition.find('l')[0].path().should.eql("/TEI.2/text/body/div[2]/p[1]/l[1]")
 
   xit 'selects a passage with a fine selector', -> # doesn't work because <l> tags don't have n='' at the moment.
+=======
+  # These are broken because the new vendorized XML has div1s and milestones!
+
+  xit 'selects a passage with a coarse selector', ->
+    annotatedEdition = AnnotatedEdition.make(citationMapping, '2', annotator, document)
+    annotatedEdition.find('l')[0].path().should.eql("/TEI.2/text/body/div[2]/p[1]/l[1]")
+
+  xit 'selects a passage with a fine selector', ->
+>>>>>>> 03dcaaafb7bad329e876e35d83efa21362b0ff09
     annotatedEdition = AnnotatedEdition.make(citationMapping, '2.2', annotator, document)
     annotatedEdition.path().should.eql("/TEI.2/text/body/div[2]/p[1]/l[2]")