← Back to branch summary

~ubuntu-branches/ubuntu/raring/plink/raring

« back to all changes in this revision

Viewing changes to lookup2.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Tille
  • Date: 2009-10-23 13:35:02 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20091023133502-rmnkrfi314mevnvt
Tags: 1.07-1
* New upstream version
* Removed debian/patches/20_plink-1.06-gcc4.4.patch because it
  is applied upstream
* Standards-Version: 3.8.3 (no changes needed)
* Debhelper 7
* Build-Depends: zlib1g-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
lookup2.cpp
138
138
 
139
139
// Agreed keywords
140
140
 
141
 
 
142
 
   bool useMb = par::lookup2_options.isSet("mb") 
143
 
     || par::lookup2_options.isSet("Mb")
144
 
     || par::lookup2_options.isSet("MB");
145
 
 
146
 
   bool useKb = par::lookup2_options.isSet("kb") 
147
 
     || par::lookup2_options.isSet("Kb")
148
 
     || par::lookup2_options.isSet("KB");
 
141
   OptionSet * lookup2_opt = par::opt.getOptions("LOOKUP");
 
142
   bool useMb = lookup2_opt->isSet("mb") 
 
143
     || lookup2_opt->isSet("Mb")
 
144
     || lookup2_opt->isSet("MB");
 
145
 
 
146
   bool useKb = lookup2_opt->isSet("kb") 
 
147
     || lookup2_opt->isSet("Kb")
 
148
     || lookup2_opt->isSet("KB");
149
149
 
150
150
   if ( useMb && useKb ) 
151
151
     error("Cannot specify both Mb and Kb positional queries");
152
152
 
153
153
   // A query
154
154
 
155
 
   if ( par::lookup2_options.isSet("query") )
 
155
   if ( lookup2_opt->isSet("query") )
156
156
     {
157
157
 
158
158
       NList nl(0);
190
190
             command += "&"+ key + val;
191
191
         }
192
192
     }
193
 
   else if ( par::lookup2_options.isSet("pos"))
 
193
   else if ( lookup2_opt->isSet("pos"))
194
194
     {
195
195
       // Positional query
196
196
       // Assume a comma delimited list in format:
219
219
         }
220
220
 
221
221
     }
222
 
   else if ( par::lookup2_options.isSet("list") || par::lookup2_options.isSet("file") )
 
222
   else if ( lookup2_opt->isSet("list") || lookup2_opt->isSet("file") )
223
223
     {
224
224
       checkFileExists(par::lookup2_cmd );
225
225
       ifstream IN1( par::lookup2_cmd.c_str() , ios::in );
242
242
         }       
243
243
       IN1.close();
244
244
     }
245
 
   else if ( par::lookup2_options.isSet("qfile") || par::lookup2_options.isSet("qlist") )
 
245
   else if ( lookup2_opt->isSet("qfile") || lookup2_opt->isSet("qlist") )
246
246
     {
247
247
 
248
248
       checkFileExists(par::lookup2_cmd);