X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstemmaweb%2FController%2FRoot.pm;h=5decf721576d0ae6a407806e3c4a122a3b603fdf;hb=2bfac19751089df74b9382ef3d06180560cdca7f;hp=494f5c18d8f3dec4fad44764de46f2cbed5828c2;hpb=75354c3abbba7d3146b2c676009d8b614ab8699a;p=scpubgit%2Fstemmaweb.git

diff --git a/lib/stemmaweb/Controller/Root.pm b/lib/stemmaweb/Controller/Root.pm
index 494f5c1..5decf72 100644
--- a/lib/stemmaweb/Controller/Root.pm
+++ b/lib/stemmaweb/Controller/Root.pm
@@ -33,6 +33,10 @@ components will be loaded.
 sub index :Path :Args(0) {
     my ( $self, $c ) = @_;
 
+	# Are we being asked to load a text immediately? If so 
+	if( $c->req->param('withtradition') ) {
+		$c->stash->{'withtradition'} = $c->req->param('withtradition');
+	}
     $c->stash->{template} = 'index.tt';
 }
 
@@ -137,7 +141,7 @@ sub newtradition :Local :Args(0) {
 		}
 	} else {
 		# Error unless we have a recognized filename extension
-		return _json_error( $c, 500, "Unrecognized file type extension $ext" );
+		return _json_error( $c, 403, "Unrecognized file type extension $ext" );
 	}
 	
 	# Save the tradition if we have it, and return its data or else the
@@ -173,7 +177,7 @@ sub textinfo :Local :Args(1) {
 	my( $self, $c, $textid ) = @_;
 	my $tradition = $c->model('Directory')->tradition( $textid );
 	unless( $tradition ) {
-		return _json_error( $c, 500, "No tradition with ID $textid" );
+		return _json_error( $c, 404, "No tradition with ID $textid" );
 	}	
 	my $ok = _check_permission( $c, $tradition );
 	return unless $ok;
@@ -185,37 +189,53 @@ sub textinfo :Local :Args(1) {
 		# Handle changes to owner-accessible parameters
 		my $m = $c->model('Directory');
 		my $changed;
-		# Handle scalar params
-		foreach my $param ( qw/ name language / ) {
-			if( exists $params->{$param} ) {
-				my $newval = delete $params->{$param};
-				unless( $tradition->$param eq $newval ) {
-					try {
-						$tradition->$param( $newval );
-					} catch {
-						return _json_error( $c, 500, "Error setting $param to $newval" );
-					}
+		# Handle name param - easy
+		if( exists $params->{name} ) {
+			my $newname = delete $params->{name};
+			unless( $tradition->name eq $newname ) {
+				try {
+					$tradition->name( $newname );
 					$changed = 1;
+				} catch {
+					return _json_error( $c, 500, "Error setting name to $newname" );
 				}
 			}
 		}
+		# Handle language param, making Default => null
+		my $langval = delete $params->{language} || 'Default';
+		unless( $tradition->language eq $langval ) {
+			try {
+				$tradition->language( $langval );
+				$changed = 1;
+			} catch {
+				return _json_error( $c, 500, "Error setting language to $langval" );
+			}
+		}
+
 		# Handle our boolean
+		my $ispublic = $tradition->public;
 		if( delete $params->{'public'} ) {  # if it's any true value...
 			$tradition->public( 1 );
+			$changed = 1 unless $ispublic;
+		} else {  # the checkbox was unchecked, ergo it should not be public
+			$tradition->public( 0 );
+			$changed = 1 if $ispublic;
 		}
-		# Handle ownership changes
+		
+		# Handle ownership change
 		my $newuser;
 		if( exists $params->{'owner'} ) {
 			# Only admins can update user / owner
 			my $newownerid = delete $params->{'owner'};
-			unless( $tradition->has_user && $tradition->user->id eq $newownerid ) {
+			unless( !$newownerid || 
+				( $tradition->has_user && $tradition->user->id eq $newownerid ) ) {
 				unless( $c->user->get_object->is_admin ) {
 					return _json_error( $c, 403, 
 						"Only admin users can change tradition ownership" );
 				}
-				$newuser = $m->lookup_user( $params->{'owner'} );
+				$newuser = $m->find_user({ username => $newownerid });
 				unless( $newuser ) {
-					return _json_error( $c, 500, "No such user " . $params->{'owner'} );
+					return _json_error( $c, 500, "No such user " . $newownerid );
 				}
 				$newuser->add_tradition( $tradition );
 				$changed = 1;
@@ -259,7 +279,7 @@ sub variantgraph :Local :Args(1) {
 	my( $self, $c, $textid ) = @_;
 	my $tradition = $c->model('Directory')->tradition( $textid );
 	unless( $tradition ) {
-		return _json_error( $c, 500, "No tradition with ID $textid" );
+		return _json_error( $c, 404, "No tradition with ID $textid" );
 	}	
 	my $ok = _check_permission( $c, $tradition );
 	return unless $ok;
@@ -286,7 +306,7 @@ sub stemma :Local :Args(2) {
 	my $m = $c->model('Directory');
 	my $tradition = $m->tradition( $textid );
 	unless( $tradition ) {
-		return _json_error( $c, 500, "No tradition with ID $textid" );
+		return _json_error( $c, 404, "No tradition with ID $textid" );
 	}	
 	my $ok = _check_permission( $c, $tradition );
 	return unless $ok;
@@ -300,13 +320,16 @@ sub stemma :Local :Args(2) {
 				if( $stemmaid eq 'n' ) {
 					# We are adding a new stemma.
 					$stemma = $tradition->add_stemma( 'dot' => $dot );
+					$stemmaid = $tradition->stemma_count - 1;
+				} elsif( $stemmaid !~ /^\d+$/ ) {
+					return _json_error( $c, 403, "Invalid stemma ID specification $stemmaid" );
 				} elsif( $stemmaid < $tradition->stemma_count ) {
 					# We are updating an existing stemma.
 					$stemma = $tradition->stemma( $stemmaid );
 					$stemma->alter_graph( $dot );
 				} else {
 					# Unrecognized stemma ID
-					return _json_error( $c, 500, "No stemma at index $stemmaid, cannot update" );
+					return _json_error( $c, 404, "No stemma at index $stemmaid, cannot update" );
 				}
 			} catch ( Text::Tradition::Error $e ) {
 				return _json_error( $c, 500, $e->message );
@@ -321,13 +344,32 @@ sub stemma :Local :Args(2) {
 	
 	# For a GET or a successful POST request, return the SVG representation
 	# of the stemma in question, if any.
-	$c->log->debug( "Received Accept header: " . $c->req->header('Accept') );
 	if( !$stemma && $tradition->stemma_count > $stemmaid ) {
 		$stemma = $tradition->stemma( $stemmaid );
 	}
-	$c->stash->{'result'} = $stemma 
-		? $stemma->as_svg( { size => [ 500, 375 ] } ) : '';
-	$c->forward('View::SVG');
+	my $stemma_xml = $stemma ? $stemma->as_svg( { size => [ 500, 375 ] } ) : '';
+	# What was requested, XML or JSON?
+	my $return_view = 'SVG';
+	if( my $accept_header = $c->req->header('Accept') ) {
+		$c->log->debug( "Received Accept header: $accept_header" );
+		foreach my $type ( split( /,\s*/, $accept_header ) ) {
+			# If we were first asked for XML, return SVG
+			last if $type =~ /^(application|text)\/xml$/;
+			# If we were first asked for JSON, return JSON
+			if( $type eq 'application/json' ) {
+				$return_view = 'JSON';
+				last;
+			}
+		}
+	}
+	if( $return_view eq 'SVG' ) {
+		$c->stash->{'result'} = $stemma_xml;
+		$c->forward('View::SVG');
+	} else { # JSON
+		$stemma_xml =~ s/\n/ /mg;
+		$c->stash->{'result'} = { 'stemmaid' => $stemmaid, 'stemmasvg' => $stemma_xml };
+		$c->forward('View::JSON');
+	}
 }
 
 =head2 stemmadot
@@ -343,13 +385,13 @@ sub stemmadot :Local :Args(2) {
 	my $m = $c->model('Directory');
 	my $tradition = $m->tradition( $textid );
 	unless( $tradition ) {
-		return _json_error( $c, 500, "No tradition with ID $textid" );
+		return _json_error( $c, 404, "No tradition with ID $textid" );
 	}	
 	my $ok = _check_permission( $c, $tradition );
 	return unless $ok;
 	my $stemma = $tradition->stemma( $stemmaid );
 	unless( $stemma ) {
-		return _json_error( $c, 500, "Tradition $textid has no stemma ID $stemmaid" );
+		return _json_error( $c, 404, "Tradition $textid has no stemma ID $stemmaid" );
 	}
 	# Get the dot and transmute its line breaks to literal '|n'
 	$c->stash->{'result'} = { 'dot' =>  $stemma->editable( { linesep => '|n' } ) };