X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=web%2Fhtdocs%2Fdetails%2Fupload.mc;h=c32df586d26b37e2011fa159cd539eec0b2c5896;hp=6497266981fdd40d7906e5472a078d0884b4d911;hb=0ab30e7e20933507512444aed53bcb4ba84003b1;hpb=10407193c93ec55bff9d2c221f32fdf7249a66c7 diff --git a/web/htdocs/details/upload.mc b/web/htdocs/details/upload.mc index 6497266..c32df58 100644 --- a/web/htdocs/details/upload.mc +++ b/web/htdocs/details/upload.mc @@ -1,4 +1,4 @@ -%# $Id: upload.mc,v 1.2 2007-07-17 14:31:54 mike Exp $ +%# $Id: upload.mc,v 1.3 2009-04-16 18:09:44 wosch Exp $ <%args> $filename => undef @@ -23,7 +23,23 @@ $filename => undef % return; % } <%perl> -my $fin = $r->upload()->fh(); + +my $fin; + +# Apache2.0 +if ($r->isa('Apache2::RequestRec')) { + require Apache2::Request; + require Apache2::Upload; + my $req = new Apache2::Request($r); + my $upload = $req->upload('filename'); + $fin = $upload->fh(); +} + +# Apache 1.3 +else { + $fin = $r->upload()->fh(); +} + if (!defined $fin) { $m->comp("/details/error.mc", msg => "Upload cancelled"); return; @@ -32,10 +48,11 @@ if (!defined $fin) { my $xml = join("", <$fin>); my $xc = irspy_xpath_context($xml); my $id = irspy_record2identifier($xc); -my $conn = new ZOOM::Connection("localhost:8018/IR-Explain---1", 0, +my $db = ZOOM::IRSpy::connect_to_registry(); +my $conn = new ZOOM::Connection($db, 0, user => "admin", password => "fruitbat", elementSetName => "zeerex"); -ZOOM::IRSpy::_really_rewrite_record($conn, $xc->getContextNode()); +ZOOM::IRSpy::_rewrite_zeerex_record($conn, $xc->getContextNode());

Upload OK.