From: Tara L Andrews <tla@mit.edu>
Date: Wed, 15 Jan 2014 18:52:42 +0000 (+0000)
Subject: Merge branch 'master' of https://github.com/tla/stemmaweb
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c599ad4307cca3d42523b1eb7848941bfb45aca0;hp=-c;p=scpubgit%2Fstemmaweb.git

Merge branch 'master' of https://github.com/tla/stemmaweb
---

c599ad4307cca3d42523b1eb7848941bfb45aca0
diff --combined lib/stemmaweb/Controller/Root.pm
index 8fa2489,a3cc076..bc86c30
--- a/lib/stemmaweb/Controller/Root.pm
+++ b/lib/stemmaweb/Controller/Root.pm
@@@ -144,7 -144,7 +144,7 @@@ sub newtradition :Local :Args(0) 
  			$errmsg = "XML file parsing error: $err";
  		}
  		if( $doc ) {
 -			if( $doc->documentElement->nodeName eq 'GraphML' ) {
 +			if( $doc->documentElement->nodeName eq 'graphml' ) {
  				$type = 'CollateX';
  			} elsif( $doc->documentElement->nodeName ne 'TEI' ) {
  				$errmsg = 'Unrecognized XML type ' . $doc->documentElement->nodeName;
@@@ -396,21 -396,6 +396,6 @@@ sub stemma :Local :Args(2) 
  	if( $c->req->method eq 'POST' ) {
  		if( $ok eq 'full' ) {
  			my $dot = $c->request->body_params->{'dot'};
- 			# Graph::Reader::Dot does not handle bare unicode. We get around this
- 			# by wrapping all words in double quotes, as long as they aren't already
- 			# wrapped, and as long as they aren't the initial '(di)?graph .*'.
- 			# Horrible HACK.
- 			my @dlines = split( "\n", $dot );
- 			my $wdot = '';
- 			foreach( @dlines ) {
- 				unless( /^(di)?graph/ ) { # Skip the first line
- 					s/(?<!")\b(\w+)\b(?!")/"$1"/g;
- 				}
- 				$wdot .= "$_\n";
- 			}
- 			# $dot =~ s/(?<!")\b(?!(?:digraph|stemma)\b)(\w+)\b(?!")/"$1"/g;
- 			$dot = $wdot;
- 			print STDERR "$dot\n";
  			try {
  				if( $stemmaid eq 'n' ) {
  					# We are adding a new stemma.