Changeset c3ecde for src/Parameters/Validators/Specific/KeyValueValidator.cpp

Timestamp:

Sep 26, 2012, 5:24:47 PM (12 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

856d05

Parents:

66dc36

git-author:

Frederik Heber <heber@…> (08/29/12 13:06:39)

git-committer:

Frederik Heber <heber@…> (09/26/12 17:24:47)

Message:

FIX: KeyValueValidator did not understand more than one keyvalue pair.

• now we also check for separating semi-colon and check each found pair separately.

File:

• src/Parameters/Validators/Specific/KeyValueValidator.cpp (modified) (1 diff)

src/Parameters/Validators/Specific/KeyValueValidator.cpp

@@ -25 +25 @@
 bool KeyValueValidator::isValid(const std::string & _value) const
 {
-  size_t pos0 = _value.find("=");
-  if (pos0 == std::string::npos)
-    // No "=" found.
-    return false;
+  size_t keyvaluestart = 0;
+  size_t keyvalueend = _value.length()-1;
+  do {
+    size_t keyvaluemid = _value.find("=", keyvaluestart);
+    if (keyvaluemid == std::string::npos)
+      // No "=" found.
+      return false;
 
-  if (pos0 == 0)
-    // Nothing before "=".
-    return false;
+    if (keyvaluemid == keyvaluestart)
+      // Nothing before "=".
+      return false;
 
-  if (pos0 == _value.size() - 1)
-    // Nothing after "=".
-    return false;
+    if (keyvaluemid == keyvalueend)
+      // Nothing after "=".
+      return false;
 
-  size_t pos1 = _value.find("=", pos0 + 1);
-  if (pos1 != std::string::npos)
-    // Second "=" found.
-    return false;
+    keyvalueend = keyvaluestart;
+    keyvaluestart = _value.find(";", keyvaluestart+1);
+    // allow ending semicolon
+    if (keyvaluestart == _value.length()-1)
+      keyvaluestart = std::string::npos;
+  } while (keyvaluestart != std::string::npos);
 
   return true;