reforming file glob, far from ready

pub/src/file_in.cpp

@@ -29,21 +29,23 @@ namespace NFileIn {
     void Load_96( FILE *F_in, string flong );
 }
 
+
 //! Load file in current or legacy format.
+
 void NFileIn::Load(void)
 {
-    string fnames = wask( "Load file(s)" ); // PROVIS, sask sobald glob besser
+    string fnames = sask( "Load file(s)" );
     vector<string> vflong; // unix names
     if( mystd::glob_file_list( fnames, "y08", &vflong )<=0 )
         throw "files " + fnames + " not found";
     FILE *F_in;
-    string fdir, fshort, fext;
     // cout << "DEBUG: size " << vflong.size() << "\n";
     for( uint i=0; i<vflong.size(); ++i ) {
         if( !(F_in = fopen(vflong[i].c_str(), "r")) )
             throw string( "cannot open file " ) + vflong[i];
         try{ 
             cout << ".. loading file " << vflong[i] << "\n";
+            string fdir, fshort, fext;
             mystd::fname_divide( vflong[i], &fdir, &fshort, &fext);
             
             if        ( fext=="y08" ) {
@@ -75,7 +77,9 @@ void NFileIn::Load(void)
     }
 }
 
+
 //! Load a YAML file in y08 format.
+
 void NFileIn::Load_08( ifstream& FS, string flong )
 {
     string lin, key, val, fdir, fshort, fext, res;
@@ -250,7 +254,9 @@ void NFileIn::Load_08( ifstream& FS, string flong )
     NOlm::OloAdd( fout );
 }
 
+
 //! Load a .a01 formatted file.
+
 void NFileIn::Load_01( FILE *F_in, string flong )
 {
     string lin, key, val, fdir, fshort, fext;
@@ -342,6 +348,7 @@ void NFileIn::Load_01( FILE *F_in, string flong )
 
 
 //! Load a spectrum from a .a01 formatted files.
+
 void NFileIn::LoadSpec_01( FILE *F_in, PSpec& sout, int nz )
 {
     int err;
@@ -378,6 +385,7 @@ void NFileIn::LoadSpec_01( FILE *F_in, PSpec& sout, int nz )
 
 
 //! Load a .i96 formatted file.
+
 void NFileIn::Load_96( FILE *F_in, string flong )
 {
     string lin, key, val, fdir, fshort, fext;

pub/src/mystd.cpp

@@ -65,21 +65,6 @@ string strg( char val )
 }
 
 
-//**************************************************************************//
-//*  string operations                                                     *//
-//**************************************************************************//
-
-string mystd::strip(
-    string const& str, ///< the original string
-    char const* sepSet ///< C string with characters to be dropped
-)
-{
-    string::size_type const first = str.find_first_not_of(sepSet);
-    return ( first==std::string::npos )
-        ? std::string()
-        : str.substr(first, str.find_last_not_of(sepSet)-first+1);
-}
-
 //**************************************************************************//
 //*  yaml                                                                  *//
 //**************************************************************************//
@@ -224,6 +209,21 @@ bool mystd::any2uint( const string& inp, uint *val )
     return false;
 }
 
+//**************************************************************************//
+//*  string operations                                                     *//
+//**************************************************************************//
+
+string mystd::strip(
+    string const& str, ///< the original string
+    char const* sepSet ///< C string with characters to be dropped
+)
+{
+    string::size_type const first = str.find_first_not_of(sepSet);
+    return ( first==std::string::npos )
+        ? std::string()
+        : str.substr(first, str.find_last_not_of(sepSet)-first+1);
+}
+
 void mystd::string_extract_word( const string& in, string *out1, string *out2 )
 {
     // one word (*out1) is extracted; leading " \t" are retained.
@@ -277,6 +277,14 @@ void mystd::string_extract_line( const string& in, string *out1, string *out2 )
     //cout << "from ["<<in<<"] line ["<<*out1<<"] and tail ["<<*out2<<"]\n";
 }
 
+
+//! Split string at whitespaces, set vector of words.
+
+void mystd::string2words( const string& in, vector<string>& out )
+{
+}
+
+
 //**************************************************************************//
 //*  improved libc calls                                                   *//
 //**************************************************************************//
@@ -458,21 +466,17 @@ string mystd::wordexp_unique( const string& s )
     return ret;
 }
 
+
+//! Expansion of file list.
+
 int mystd::glob_file_list( const string& text, const string& ext,
-                           vector<string> *flong, vector<string> *fshort )
-// input:
-//     text:   bash-like file list
-//     pre:    prepend this
-//     ext:    append this (except if text already contains extension)
-// output:
-//     flong:  unix file names
-//     fshort: internal (rda) file names  
+                           vector<string> *flong )
 
 // the implementation with globpattern is OBSOLET: better use wordexp(3)
 
 {
     string globpattern = text;
-    if( ext!=string("") and
+    if( ext!="" and
         not ( (int)(text.rfind(".")) > 0 and (int)(text.rfind(".")) > (int)(text.rfind("/")) ) ) 
         globpattern += string(".") + ext;
 
@@ -486,7 +490,6 @@ int mystd::glob_file_list( const string& text, const string& ext,
         uint ipre = fnam.rfind("/") + 1;
         uint isub = fnam.rfind(string(".")+ext) - ipre;
         flong->push_back(fnam);
-        if( fshort ) fshort->push_back(fnam.substr(ipre, isub));
     }
 
     globfree(&globbuf);

pub/src/mystd.h

@@ -26,12 +26,13 @@ namespace mystd {
     bool any2dbl( const string& inp, double *val );
     bool any2int( const string& inp, int *val );
     bool any2uint( const string& inp, uint *val );
-    void string_extract_word( const string& in, string *out1, string *out2 );
-    void string_extract_line( const string& in, string *out1, string *out2 );
 
     //! string operations
+    void string_extract_word( const string& in, string *out1, string *out2 );
+    void string_extract_line( const string& in, string *out1, string *out2 );
+    void string2words( const string& in, vector<string>& out );
     string strip( const string& str, const char* sepSet=" \n" );
-
+    
     //! improved libc calls
     void system( string cmd );
 
@@ -54,8 +55,8 @@ namespace mystd {
     // file names, globbing, file read
     void fname_divide( const string& fname, string *fdir,
                        string *fshort, string *fext);
-    int glob_file_list( const string& text, const string& ext, 
-                        vector<string> *flong, vector<string> *fshort=0);
+    int glob_file_list( const string& pattern, const string& extension, 
+                        vector<string> *fnames );
     string wordexp_unique( const string& s );
     int freadln( FILE *fd, string *s );