/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 7820

send the original filename in the upload() method since that is supported by the Metacat API. https://projects.ecoinformatics.org/ecoinfo/issues/6007

     		return 0;
+    	}
     	# remove the uniqueness of the filename
     	# 'tempXXXXX'
     	$cleanName = substr($cleanName, 9);
     	if ( !$docid ) {
     		$docid = newAccessionNumber( $config->{'scope'}, $metacat );
     		my $uploadReturn = uploadData( $outFile, $docid );
     		my $uploadReturn = uploadData( $outFile, $docid, $cleanName );
     		if ( !$uploadReturn ) {
     			debug("Uploading the data failed.");
+    		}
-...
     	# TODO:  should match the object promotion path, so that an
     	#        Excel upload results in 'dataTable' in this field
     	my $entityType = 'Other';
     	# remove the uniqueness of the filename
     	# 'tempXXXXX'
     	$cleanName = substr($cleanName, 9);
     	my %dataInfo = (
     		'docid'       => $docid,
-...
     sub uploadData {
     	my $data  = shift;
     	my $docid = shift;
     	my $filename = shift;
     	debug("Upload -- Starting upload of $docid");
     	my $response = $metacat->upload( $docid, $data );
     	my $response = $metacat->upload( $docid, $data, $filename );
     	if ( !$response ) {
     		my $uploadMsg = $metacat->getMessage();
     		push( @errorMessages,

       my $self = shift;
       my $docid = shift;
       my $datafile = shift;
       my $filename = shift;
       my $returnval = 0;
       my %postData = ( action => 'upload',
                        docid => $docid,
                        datafile => [$datafile],
                        filename => $filename,
                        enctype => 'form-data'
                      );

Also available in: Unified diff