octave-nkf: src/load-save.cc comparison

comparison src/load-save.cc @ 4687:e95c86d48732

[project @ 2004-01-06 21:53:34 by jwe]

author	jwe
date	Tue, 06 Jan 2004 21:53:34 +0000
parents	f6d6335c08f6
children	bdc51b369a78

comparison

equal deleted inserted replaced

-:c7ae43dfdea4
+:e95c86d48732
 }
 octave_value
 do_load (std::istream& stream, const std::string& orig_fname, bool force,
 	 load_save_format format, oct_mach_info::float_format flt_fmt,
-	 bool list_only, bool swap, bool verbose, bool import,
+	 bool list_only, bool swap, bool verbose,
 	 const string_vector& argv, int argv_idx, int argc, int nargout)
 {
 octave_value retval;
 Octave_map retstruct;
 	  name = read_mat_binary_data (stream, orig_fname, tc);
 	  break;
 #ifdef HAVE_HDF5
 	case LS_HDF5:
-	  name = read_hdf5_data (stream, orig_fname,
+	  name = read_hdf5_data (stream, orig_fname, global, tc, doc);
-				 global, tc, doc, import);
 	  break;
 #endif /* HAVE_HDF5 */
 	case LS_MAT5_BINARY:
 	  name = read_mat5_binary_element (stream, orig_fname, swap,
 @item -hdf5\n\
 Force Octave to assume the file is in HDF5 format.\n\
 (HDF5 is a free, portable binary format developed by the National\n\
 Center for Supercomputing Applications at the University of Illinois.)\n\
 Note that Octave can read HDF5 files not created by itself, but may\n\
-skip some datasets in formats that it cannot support.  In particular,\n\
+skip some datasets in formats that it cannot support.\n"
-it will skip datasets of data types that it does not recognize, with\n\
-dimensionality > 2, or with names that aren't valid Octave identifiers\n\
-See, however, the @samp{-import} option to ameliorate this somewhat.\n"
 HAVE_HDF5_HELP_STRING
 "\n\
 @item -import\n\
-Make a stronger attempt to import foreign datasets.  Currently, this means\n\
+The @samp{-import} is acceptted but ignored for backward compatiability.\n\
-that for HDF5 files, invalid characters in names are converted to @samp{_},\n\
+Octave can now support multi-dimensional HDF data and automatically modifies\n\
-and datasets with dimensionality > 2 are imported as lists of matrices (or\n\
+variable names if they are invalid Octave identifiers.\n\
-lists of lists of matrices, or ...).\n\
 \n\
 @end table\n\
 @end deffn")
 {
 octave_value_list retval;
 load_save_format format = LS_UNKNOWN;
 bool force = false;
 bool list_only = false;
 bool verbose = false;
-bool import = false;
 int i;
 for (i = 1; i < argc; i++)
 {
 if (argv[i] == "-force" || argv[i] == "-f")
 	  return retval;
 #endif /* ! HAVE_HDF5 */
 	}
 else if (argv[i] == "-import" || argv[i] == "-i")
 	{
-	  import = true;
+	  warning ("load: -import ignored");
 	}
 else
 	break;
 }
 	  // previous call, how do we fix up the state of std::cin so
 	  // that we can get additional input?  I'm afraid that we
 	  // can't fix this using std::cin only.
 	  retval = do_load (std::cin, orig_fname, force, format, flt_fmt,
-			    list_only, swap, verbose, import, argv, i, argc,
+			    list_only, swap, verbose, argv, i, argc,
 			    nargout);
 	}
 else
 	error ("load: must specify file format if reading from stdin");
 }
 	  if (hdf5_file.file_id >= 0)
 	    {
 	      retval = do_load (hdf5_file, orig_fname, force, format,
 				flt_fmt, list_only, swap, verbose,
-				import, argv, i, argc, nargout);
+				argv, i, argc, nargout);
 	      hdf5_file.close ();
 	    }
 	  else
 	    error ("load: couldn't open input file `%s'",
 		      return retval;
 		    }
 		}
 	      retval = do_load (file, orig_fname, force, format,
-				flt_fmt, list_only, swap, verbose, import,
+				flt_fmt, list_only, swap, verbose,
 				argv, i, argc, nargout);
 	      file.close ();
 	    }
 	  else
 	    error ("load: couldn't open input file `%s'",
 {
 i++;
 #ifdef HAVE_HDF5
 if (format == LS_HDF5)
-error ("load: cannot write HDF5 format to stdout");
+error ("save: cannot write HDF5 format to stdout");
 else
 #endif /* HAVE_HDF5 */
 	// don't insert any commands here!  the brace below must go
 	// with the "else" above!
 	{
 #ifdef HAVE_HDF5
 if (format == LS_HDF5)
 	{
 	  hdf5_ofstream hdf5_file (fname.c_str ());
-	  if (hdf5_file.file_id >= 0) {
+	  if (hdf5_file.file_id >= 0)
-	    save_vars (argv, i, argc, hdf5_file, save_builtins, format,
+	    {
-		       save_as_floats, true);
+	      save_vars (argv, i, argc, hdf5_file, save_builtins, format,
+			 save_as_floats, true);
-	    hdf5_file.close ();
+	      hdf5_file.close ();
 	  }
 	else
 	  {
 	    error ("save: couldn't open output file `%s'", fname.c_str ());
 	    return retval;

Mercurial > octave-nkf

comparison src/load-save.cc @ 4687:e95c86d48732