41,42d40
< var gcomma=',';
< var simplegroupby='';
47d44
< var wheresor=[];
59,60d55
< var xsqlis='';
< var xsqlisyellow='';
132c127
<          wheresijfrom=wheres[ij].trim().replace(/^\!/g,'').split('<')[0].split('>')[0].split('!')[0].split('=')[0].split('|')[0].trim();
---
>          wheresijfrom=wheres[ij].trim().replace(/^\!/g,'').split('<')[0].split('>')[0].split('!')[0].split('=')[0];
135c130
<               orderbys[ji]=orderbys[ji].replace('~' + wheresijfrom + ' ', '~' + eval(1 + lefties) + ' ').replace('|' + wheresijfrom + ' ', '|' + eval(1 + lefties) + ' ').replace('`' + wheresijfrom + ' ', '|' + eval(1 + lefties) + ' ').replace(' ' + wheresijfrom + ' ', ' ' + eval(1 + lefties) + ' ');
---
>               orderbys[ji]=orderbys[ji].replace('~' + wheresijfrom + ' ', '~' + eval(1 + lefties) + ' ').replace('|' + wheresijfrom + ' ', '|' + eval(1 + lefties) + ' ').replace(' ' + wheresijfrom + ' ', ' ' + eval(1 + lefties) + ' ');
149c144
<               orderbys[ji]=orderbys[ji].replace('~' + wheresijfrom + ' ', '~' + eval(0 + lefties) + ' ').replace('|' + wheresijfrom + ' ', '|' + eval(0 + lefties) + ' ').replace('`' + wheresijfrom + ' ', '|' + eval(0 + lefties) + ' ').replace(' ' + wheresijfrom + ' ', ' ' + eval(0 + lefties) + ' ');
---
>               orderbys[ji]=orderbys[ji].replace('~' + wheresijfrom + ' ', '~' + eval(0 + lefties) + ' ').replace('|' + wheresijfrom + ' ', '|' + eval(0 + lefties) + ' ').replace(' ' + wheresijfrom + ' ', ' ' + eval(0 + lefties) + ' ');
163,205d157
< function togglecomplexity() {
<    var tdos=[], itdos=0;
<    var wasstr='';
<    var rest='';
<    var simplify=true;
<    var startpointis=document.getElementById('demo').innerHTML;
<    var endpointis=startpointis;
<    var strtolookforname=document.getElementById('tdname').innerHTML.split(',')[0];
<    var strtolookforquantity=document.getElementById('tdquantity').innerHTML.split(',')[0];
<    if ((strtolookforname.trim() + strtolookforquantity.trim()) == '') {   return ''; }
<    if (document.getElementById('demo').innerHTML.indexOf(document.getElementById('tdname').innerHTML + ' ') != -1 && document.getElementById('demo').innerHTML.indexOf(' ' + document.getElementById('tdquantity').innerHTML) != -1) {
<        tdos=document.getElementsByTagName('td');
<        for (itdos=0; itdos<tdos.length; itdos++) {
<           if (('' + tdos[itdos].id).indexOf('tdquantity') != -1) {
<              rest=('' + tdos[itdos].id).split('tdquantity')[1];
<              wasstr=document.getElementById('tdname' + rest).innerHTML + ' ' + startpointis.split(document.getElementById('tdname' + rest).innerHTML + ' ')[1].split('<')[0];
<              endpointis=endpointis.replace(wasstr, document.getElementById('tdname' + rest).innerHTML.split(',')[0] + ' ' + document.getElementById('tdquantity' + rest).innerHTML.split(',')[0]);
<           }
<        }
<        gcomma=',';
<        document.getElementById('demo').innerHTML=endpointis;
<        if (simplegroupby != '') {
<           document.getElementById('demo').title=simplegroupby;
<        }
<    } else if (document.getElementById('demo').innerHTML.indexOf(strtolookforname + ' ') != -1 && document.getElementById('demo').innerHTML.indexOf(' ' + strtolookforquantity) != -1) { // make more complex
<        if (simplegroupby == '') {
<           simplegroupby=document.getElementById('demo').title;
<        }
<        tdos=document.getElementsByTagName('td');
<        for (itdos=0; itdos<tdos.length; itdos++) {
<           if (('' + tdos[itdos].id).indexOf('tdquantity') != -1) {
<              rest=('' + tdos[itdos].id).split('tdquantity')[1];
<              wasstr=document.getElementById('tdname' + rest).innerHTML.split(',')[0] + ' ' + startpointis.split(document.getElementById('tdname' + rest).innerHTML.split(',')[0] + ' ')[1].split('<')[0];
<              endpointis=endpointis.replace(wasstr, document.getElementById('tdname' + rest).innerHTML + ' ' + document.getElementById('tdquantity' + rest).innerHTML);
<           }
<        }
<        gcomma='youllneverfindthis';
<        document.getElementById('demo').innerHTML=endpointis;
<        if (document.body.title == '' && xsqlis != '') { document.title=xsqlis;  }
<        document.getElementById('demo').title=document.body.title + ' ' + 'GROUP BY ' + simplegroupby.split('GROUP BY ')[1];
<    }
< }
< 
212,218d163
<    if ((document.getElementById('thname').innerHTML + document.getElementById('thquantity').innerHTML).indexOf(',') != -1) {
<       document.getElementById('threport').title='Double click in yellow report to toggle the coxplexity of the report.';
<       document.getElementById('demo').ondblclick=function(){  togglecomplexity();  }
<    } else {
<       document.getElementById('threport').title='';
<       document.getElementById('demo').ondblclick=function(){  document.getElementById('threport').title=document.getElementById('threport').title;  }
<    }
255,257d199
<          } else if (sqlis.replace(/\ OR\ $/g,'') != sqlis) {
<            sqlis+=wheres[ij].trim().replace(/^\!/g, ' NOT ') + ' ';
<            sqlisyellow+=wheres[ij].trim().replace(/^\!/g, ' NOT ') + ' ';
268c210
<            orderbys[ij]=asit(orderbys[ij].replace('~' + mappings[jk].from + ' ', '~' + mappings[jk].to + ' ').replace('|' + mappings[jk].from + ' ', '|' + mappings[jk].to + ' ').replace('`' + mappings[jk].from + ' ', '`' + mappings[jk].to + ' ').replace(' ' + mappings[jk].from + ' ', ' ' + mappings[jk].to + ' '));
---
>            orderbys[ij]=asit(orderbys[ij].replace('~' + mappings[jk].from + ' ', '~' + mappings[jk].to + ' ').replace('|' + mappings[jk].from + ' ', '|' + mappings[jk].to + ' ').replace(' ' + mappings[jk].from + ' ', ' ' + mappings[jk].to + ' '));
272,281c214,215
<            sqlis+=(' ORDER BY ' + orderbys[ij].trim().replace(/\~/g, '').replace(/^\|/g, '').replace(/\|$/g,' OR ') + ' ASC ').replace(' OR ASC ',' ASC OR ');
<            sqlisyellow+=(' ORDER BY ' + orderbys[ij].trim().replace(/\~/g, '').replace(/^\|/g, '').replace(/\|$/g,' OR ') + ' ASC ').replace(' OR ASC ',' ASC OR ');
<            } else {
<            sqlis+=(' ORDER BY ' + orderbys[ij].trim().replace(/\~/g, '').replace(/^\|/g, '').replace(/\|$/g,' OR ') + ' DESC ').replace(' OR DESC ',' DESC OR ');
<            sqlisyellow+=(' ORDER BY ' + orderbys[ij].trim().replace(/\~/g, '').replace(/^\|/g, '').replace(/\|$/g,' OR ') + ' DESC ').replace(' OR DESC ',' DESC OR ');
<            }
<          } else if (sqlis.replace(/\ OR\ $/g,'') != sqlis) {
<            if (orderbys[ij].indexOf('~') != -1) {
<            sqlis+=(orderbys[ij].trim().replace(/\~/g, '').replace(/^\|/g, '').replace(/\|$/g,' OR ') + ' ASC ').replace(' OR ASC ',' ASC OR ');
<            sqlisyellow+=(orderbys[ij].trim().replace(/\~/g, '').replace(/^\|/g, '').replace(/\|$/g,' OR ') + ' ASC ').replace(' OR ASC ',' ASC OR ');
---
>            sqlis+=' ORDER BY ' + orderbys[ij].trim().replace(/\~/g, '').replace(/\|/g, '') + ' ASC ';
>            sqlisyellow+=' ORDER BY ' + orderbys[ij].trim().replace(/\~/g, '').replace(/\|/g, '') + ' ASC ';
283,284c217,218
<            sqlis+=(orderbys[ij].trim().replace(/\~/g, '').replace(/^\|/g, '').replace(/\|$/g,' OR ') + ' DESC ').replace(' OR DESC ',' DESC OR ');
<            sqlisyellow+=(orderbys[ij].trim().replace(/\~/g, '').replace(/^\|/g, '').replace(/\|$/g,' OR ') + ' DESC ').replace(' OR DESC ',' DESC OR ');
---
>            sqlis+=' ORDER BY ' + orderbys[ij].trim().replace(/\~/g, '').replace(/\|/g, '') + ' DESC ';
>            sqlisyellow+=' ORDER BY ' + orderbys[ij].trim().replace(/\~/g, '').replace(/\|/g, '') + ' DESC ';
288,289c222,223
<            sqlis+=(' AND ' + orderbys[ij].trim().replace(/\~/g, '').replace(/^\|/g, '').replace(/\|$/g,' OR ') + ' ASC ').replace(' OR ASC ',' ASC OR ');
<            sqlisyellow+=(' AND ' + orderbys[ij].trim().replace(/\~/g, '').replace(/^\|/g, '').replace(/\|$/g,' OR ') + ' ASC ').replace(' OR ASC ',' ASC OR ');
---
>            sqlis+=' AND ' + orderbys[ij].trim().replace(/\~/g, '').replace(/\|/g, '') + ' ASC ';
>            sqlisyellow+=' AND ' + orderbys[ij].trim().replace(/\~/g, '').replace(/\|/g, '') + ' ASC ';
291,292c225,226
<            sqlis+=(' AND ' + orderbys[ij].trim().replace(/\~/g, '').replace(/^\|/g, '').replace(/\|$/g,' OR ') + ' DESC ').replace(' OR DESC ',' ASC DESC ');
<            sqlisyellow+=(' AND ' + orderbys[ij].trim().replace(/\~/g, '').replace(/^\|/g, '').replace(/\|$/g,' OR ') + ' DESC ').replace(' OR DESC ',' DESC OR ');
---
>            sqlis+=' AND ' + orderbys[ij].trim().replace(/\~/g, '').replace(/\|/g, '') + ' DESC ';
>            sqlisyellow+=' AND ' + orderbys[ij].trim().replace(/\~/g, '').replace(/\|/g, '') + ' DESC ';
341d274
<   if (('' + location.hash).indexOf('#data') == 0) { return inidea;  }
375d307
<   if (('' + location.hash).indexOf('#data') == 0) { return inidea;  }
409d340
<   if (('' + location.hash).indexOf('#data') == 0) { return inidea;  }
451d381
<   if (('' + location.hash).indexOf('#data') == 0) { return injdea;  }
556c486
<       outstuff+='&sql='; // + encodeURIComponent(sqlis.replace(indemo.innerHTML,indemo.innerHTML.split(',')[0]).replace(indemotwo.innerHTML,indemotwo.innerHTML.split(',')[0]));
---
>       outstuff+='&sql=' + encodeURIComponent(sqlis.replace(indemo.innerHTML,indemo.innerHTML.split(',')[0]).replace(indemotwo.innerHTML,indemotwo.innerHTML.split(',')[0]));
558c488
<       outstuff+='&sql='; // + encodeURIComponent(sqlis.replace(indemo.innerHTML,indemo.innerHTML.split(',')[0]));
---
>       outstuff+='&sql=' + encodeURIComponent(sqlis.replace(indemo.innerHTML,indemo.innerHTML.split(',')[0]));
561c491
<     outstuff+='&thname=' + encodeURIComponent(('' + (indemo.innerHTML.split(gcomma)[0])))
---
>     outstuff+='&thname=' + encodeURIComponent(('' + (indemo.innerHTML.split(',')[0])))
563c493
<       outstuff+='&sql='; // + encodeURIComponent(sqlis.replace(indemo.innerHTML,indemo.innerHTML.split(',')[0]).replace(indemotwo.innerHTML,indemotwo.innerHTML.split(',')[0]));
---
>       outstuff+='&sql=' + encodeURIComponent(sqlis.replace(indemo.innerHTML,indemo.innerHTML.split(',')[0]).replace(indemotwo.innerHTML,indemotwo.innerHTML.split(',')[0]));
565c495
<       outstuff+='&sql='; // + encodeURIComponent(sqlis.replace(indemo.innerHTML,indemo.innerHTML.split(',')[0]));
---
>       outstuff+='&sql=' + encodeURIComponent(sqlis.replace(indemo.innerHTML,indemo.innerHTML.split(',')[0]));
571c501
<       outstuff+='&sql='; // + encodeURIComponent(sqlis.replace(indemo.innerHTML,indemo.innerHTML.split(',')[0]));
---
>       outstuff+='&sql=' + encodeURIComponent(sqlis.replace(indemo.innerHTML,indemo.innerHTML.split(',')[0]));
573c503
<     outstuff+='?thquantity=' + encodeURIComponent(('' + (indemo.innerHTML.split(gcomma)[0])))
---
>     outstuff+='?thquantity=' + encodeURIComponent(('' + (indemo.innerHTML.split(',')[0])))
576c506
<       outstuff+='&sql='; // + encodeURIComponent(sqlis.replace(indemo.innerHTML,indemo.innerHTML.split(',')[0]));
---
>       outstuff+='&sql=' + encodeURIComponent(sqlis.replace(indemo.innerHTML,indemo.innerHTML.split(',')[0]));
578c508
<     outstuff+='&thquantity=' + encodeURIComponent(('' + (indemo.innerHTML.split(gcomma)[0])))
---
>     outstuff+='&thquantity=' + encodeURIComponent(('' + (indemo.innerHTML.split(',')[0])))
593c523
<     outstuff+='&sql='; // + encodeURIComponent(sqlis);
---
>     outstuff+='&sql=' + encodeURIComponent(sqlis);
595c525
<     //outstuff+='&sqlyellow=' + encodeURIComponent(sqlisyellow);
---
>     outstuff+='&sqlyellow=' + encodeURIComponent(sqlisyellow);
599c529
<     //outstuff+='&sqlyellow=' + encodeURIComponent(sqlisyellow);
---
>     outstuff+='&sqlyellow=' + encodeURIComponent(sqlisyellow);
632c562
<                alert('reprecs[ireprecs]=' + reprecs[ireprecs]);
---
>                //alert('reprecs[ireprecs]=' + reprecs[ireprecs]);
652c582
<                //alert('Reprecs[ireprecs] =' + reprecs[ireprecs]);
---
>                //alert('reprecs[ireprecs] =' + reprecs[ireprecs]);
670c600
<      return '=' + inid.split(' OR ')[0];
---
>      return '=' + inid;
672c602
<    return inid.split(' OR ')[0];
---
>    return inid;
677d606
<   var forgetitnow=false;
679c608
<   var recok=true, thisok=true, overallok=false;
---
>   var recok=true, thisok=true;
690c619
<     myrec=('"' + maybenotvaln(knownname.replace(/\'/g,'`')).replace(/\,/g,'","') + '","' + maybenotvalq(('' + knownquantity), knownname).replace(/\,$/g, '').replace(/\,/g,'","') + '"');
---
>     myrec=('"' + maybenotvaln(knownname).replace(/\,/g,'","') + '","' + maybenotvalq(('' + knownquantity), knownname).replace(/\,$/g, '').replace(/\,/g,'","') + '"');
695d623
<     overallok=false;
698c626
<      if (!forgetitnow && (thisok || wheresor[jwi].toUpperCase() == ' OR ')) {
---
>      if (thisok) {
713,714d640
<      if (thisok && wheresor[jwi].toUpperCase() == ' OR ') { overallok=true;  }
<      if (!thisok && wheresor[jwi].toUpperCase() == ' AND ') { overallok=false; thisok=false; forgetitnow=true;  }
717d642
<     if (overallok) { thisok=true; }
720,727c645
<   if (recok || overallok) {
<   if ((('' + location.hash)).indexOf('#data') == 0) {
<   //alert(knownquantity);
<   fruits.push({name:knownname, quantity:('' + knownquantity)});
<   qval=maybenotvalq(('' + knownquantity), knownname);
<   fruity.push({name:maybenotvaln(knownname), quantity:qval});
<   m.set(maybenotvaln(knownname), qval);
<   } else {
---
>   if (recok) {
733d650
<   }
737c654
<     myrec=('"' + maybenotvaln(knownname.replace(/\'/g,'`')).replace(/\,/g,'","') + '","' + maybenotvalq(('' + knownquantity), knownname).replace(/\,$/g, '').replace(/\,/g,'","') + '"');
---
>     myrec=('"' + maybenotvaln(knownname).replace(/\,/g,'","') + '","' + maybenotvalq(('' + knownquantity), knownname).replace(/\,$/g, '').replace(/\,/g,'","') + '"');
742d658
<     overallok=false;
745c661
<      if (!forgetitnow && (thisok || wheresor[jwi].toUpperCase() == ' OR ')) {
---
>      if (thisok) {
748c664
<       eval('thisok=((' + myfields[eval(-1 + eval('' + wheresijfrom))] + ee(wheres[jwi].replace(/\ OR\ $/g,'').replace(/\|$/g,'').replace(wheres[jwi].replace(/\ OR\ $/g,'').replace(/\|$/g,'').trim().replace(/^\!/g,'').split('<')[0].split('>')[0].split('!')[0].split('=')[0],'').trim(),'') + ') ? false : true)');
---
>       eval('thisok=((' + myfields[eval(-1 + eval('' + wheresijfrom))] + ee(wheres[jwi].replace(wheres[jwi].trim().replace(/^\!/g,'').split('<')[0].split('>')[0].split('!')[0].split('=')[0],'').trim(),'') + ') ? false : true)');
751,756c667,668
<       //alert(wheresijfrom + ' ' + myrec + ' thisok=((' + myfields[eval(-1 + eval('' + wheresijfrom))] + ee(wheres[jwi].replace(/\ OR\ $/g,'').replace(/\|$/g,'').replace(wheres[jwi].replace(/\ OR\ $/g,'').replace(/\|$/g,'').trim().replace(/^\!/g,'').split('<')[0].split('>')[0].split('!')[0].split('=')[0],'').trim(),'') + ') ? true : false)');
<       //try {
<       eval('thisok=((' + myfields[eval(-1 + eval('' + wheresijfrom))] + ee(wheres[jwi].replace(/\ OR\ $/g,'').replace(/\|$/g,'').replace(wheres[jwi].replace(/\ OR\ $/g,'').replace(/\|$/g,'').trim().replace(/^\!/g,'').split('<')[0].split('>')[0].split('!')[0].split('=')[0],'').trim(),'') + ') ? true : false)');
<       //} catch(gfdghf) {
<       //alert(wheresijfrom + ' ' + myrec + ' thisok=((' + myfields[eval(-1 + eval('' + wheresijfrom))] + ee(wheres[jwi].replace(/\ OR\ $/g,'').replace(/\|$/g,'').replace(wheres[jwi].replace(/\ OR\ $/g,'').replace(/\|$/g,'').trim().replace(/^\!/g,'').split('<')[0].split('>')[0].split('!')[0].split('=')[0],'').trim(),'') + ') ? true : false)');
<       //}
---
>       //alert(wheresijfrom + ' ' + myrec + ' thisok=((' + myfields[eval(-1 + eval('' + wheresijfrom))] + ee(wheres[jwi].replace(wheres[jwi].trim().replace(/^\!/g,'').split('<')[0].split('>')[0].split('!')[0].split('=')[0],'').trim(),'') + ') ? true : false)');
>       eval('thisok=((' + myfields[eval(-1 + eval('' + wheresijfrom))] + ee(wheres[jwi].replace(wheres[jwi].trim().replace(/^\!/g,'').split('<')[0].split('>')[0].split('!')[0].split('=')[0],'').trim(),'') + ') ? true : false)');
760c672
<       eval('thisok=(("' + myfields[eval(-1 + eval('' + wheresijfrom))] + '"' + ee(wheres[jwi].replace(/\ OR\ $/g,'').replace(/\|$/g,'').replace(wheres[jwi].replace(/\ OR\ $/g,'').replace(/\|$/g,'').trim().replace(/^\!/g,'').split('<')[0].split('>')[0].split('!')[0].split('=')[0],'').trim(),'') + ') ? false : true)');
---
>       eval('thisok=(("' + myfields[eval(-1 + eval('' + wheresijfrom))] + '"' + ee(wheres[jwi].replace(wheres[jwi].trim().replace(/^\!/g,'').split('<')[0].split('>')[0].split('!')[0].split('=')[0],'').trim(),'') + ') ? false : true)');
762c674
<       eval('thisok=(("' + myfields[eval(-1 + eval('' + wheresijfrom))] + '"' + ee(wheres[jwi].replace(/\ OR\ $/g,'').replace(/\|$/g,'').replace(wheres[jwi].replace(/\ OR\ $/g,'').replace(/\|$/g,'').trim().replace(/^\!/g,'').split('<')[0].split('>')[0].split('!')[0].split('=')[0],'').trim(),'') + ') ? true : false)');
---
>       eval('thisok=(("' + myfields[eval(-1 + eval('' + wheresijfrom))] + '"' + ee(wheres[jwi].replace(wheres[jwi].trim().replace(/^\!/g,'').split('<')[0].split('>')[0].split('!')[0].split('=')[0],'').trim(),'') + ') ? true : false)');
765,766d676
<      if (thisok && wheresor[jwi].toUpperCase() == ' OR ') { overallok=true;  }
<      if (!thisok && wheresor[jwi].toUpperCase() == ' AND ') { overallok=false; thisok=false; forgetitnow=true;  }
769d678
<     if (overallok) { thisok=true; }
772c681
<   if (recok || overallok) {
---
>   if (recok) {
791c700
<   if (('' + location.hash).indexOf('#data') != 0) { beadjustable(); }
---
>   beadjustable();
828,829d736
< var comma=',';
< if (('' + location.hash).indexOf('#data') == 0) { comma='youllneverfindthis';  }
844c751
<   text += "" + x.name.split(comma)[0] + " " + x.quantity.split(comma)[0] + "<br>";
---
>   text += "" + x.name.split(',')[0] + " " + x.quantity.split(',')[0] + "<br>";
859c766
<   text += "" + x.name.split(comma)[0] + " " + x.quantity.split(comma)[0] + "<br>";
---
>   text += "" + x.name.split(',')[0] + " " + x.quantity.split(',')[0] + "<br>";
878c785
<   text += "" + fruity[kk].name.split(comma)[0] + " " + fruity[kk].quantity.split(comma)[0] + "<br>";
---
>   text += "" + fruity[kk].name.split(',')[0] + " " + fruity[kk].quantity.split(',')[0] + "<br>";
896c803
<   text += "" + fruity[kk].name.split(comma)[0] + " " + fruity[kk].quantity.split(comma)[0] + "<br>";
---
>   text += "" + fruity[kk].name.split(',')[0] + " " + fruity[kk].quantity.split(',')[0] + "<br>";
1031c938
<   a.href='mailto:?subject=' + encodeURIComponent(topicis) + '%20' + encodeURIComponent(subjis) + '&body=' + encodeURIComponent(document.URL.split('?')[0].split('#')[0] + '?tippingvalue=' + moreencodeURIComponent(document.getElementById('itip').value) + '#data=') + encodeURIComponent(encodeURIComponent(contis.replace(/\<bJUNKr\>/g, String.fromCharCode(10))) + encodeURIComponent(' ! sqlisyellow ! ' + sqlisyellow) + encodeURIComponent(' ! sqlis ! ' + sqlis));
---
>   a.href='mailto:?subject=' + encodeURIComponent(topicis) + '%20' + encodeURIComponent(subjis) + '&body=' + encodeURIComponent(document.URL.split('?')[0].split('#')[0] + '?tippingvalue=' + moreencodeURIComponent(document.getElementById('itip').value) + '#data=') + encodeURIComponent(encodeURIComponent(contis.replace(/\<bJUNKr\>/g, String.fromCharCode(10))));
1040c947
<   a.href='sms:&body=' + encodeURIComponent(document.URL.split('?')[0].split('#')[0] + '?tippingvalue=' + moreencodeURIComponent(document.getElementById('itip').value) + '#data=') + encodeURIComponent(encodeURIComponent(contis.replace(/\<bJUNKr\>/g, String.fromCharCode(10))) + encodeURIComponent(' ! sqlisyellow ! ' + sqlisyellow) + encodeURIComponent(' ! sqlis ! ' + sqlis));
---
>   a.href='sms:&body=' + encodeURIComponent(document.URL.split('?')[0].split('#')[0] + '?tippingvalue=' + moreencodeURIComponent(document.getElementById('itip').value) + '#data=') + encodeURIComponent(encodeURIComponent(contis.replace(/\<bJUNKr\>/g, String.fromCharCode(10))));
1088c995
<   sqlisyellow=(location.search + location.hash).split('sqlyellow=')[1] ? (decodeURIComponent((location.search + location.hash).split('sqlyellow=')[1].split('&')[0].split('#')[0])) : '';
---
>   sqlisyellow=location.search.split('sqlyellow=')[1] ? (decodeURIComponent(location.search.split('sqlyellow=')[1].split('&')[0].split('#')[0])) : '';
1096,1116c1003
<        thiscont=decodeURIComponent(('' + location.hash).substring(5).replace(/^\=/g,'').replace(/^\%3d/g,'').replace(/^\%3D/g,'').replace(/\%0A/g,encodeURIComponent('<br>'))).split(' ! sqlisyellow !')[0];
<        if (decodeURIComponent(('' + location.hash)).indexOf(' ! sqlis ! ') != -1) {
<           sqlis=decodeURIComponent(('' + location.hash)).split(' ! sqlis ! ')[1];
<           xsqlis=sqlis;
<           document.body.title=sqlis;
<               headrec=sqlis.split('SELECT ')[1].split('<')[0].split(' FROM ')[0].trim();
<               efields=headrec.replace(/\"/g,'').split(',');
<               for (var ke=0; ke<efields.length; ke++) {
<                  eval('mappings.unshift({ from: "' + eval(ke + 1) + '", to: "' + efields[ke] + '"})');
<               }
<               document.getElementById('topic').innerHTML=headrec.replace(/^\"/g,'').substring(0).split('"')[0].split(',')[1].substring(0,1).toUpperCase() + headrec.replace(/^\"/g,'').substring(0).split('"')[0].split(',')[1].substring(1);
<               document.getElementById('thname').innerHTML=maybenotdefn(headrec.replace(/^\"/g,'').substring(0).split('"')[0].split(',')[1].substring(0,1).toUpperCase() + headrec.replace(/^\"/g,'').substring(0).split('"')[0].split(',')[1].substring(1));
<               document.getElementById('thquantity').innerHTML=maybenotdefq(headrec.replace(/^\"/g,'').substring(0).split('"')[0].split(',')[0].substring(0,1).toUpperCase() + headrec.replace(/^\"/g,'').substring(0).split('"')[0].split(',')[0].substring(1));
<               //analwheres();
< 
<        }
<        if (decodeURIComponent(('' + location.hash)).indexOf(' ! sqlisyellow ! ') != -1) {
<           sqlisyellow=decodeURIComponent(('' + location.hash)).split(' ! sqlisyellow ! ')[1].split(' ! sqlis ')[0];
<           xsqlisyellow=sqlisyellow;
<           document.getElementById('demo').title=sqlisyellow;
<        }
---
>        thiscont=decodeURIComponent(('' + location.hash).substring(5).replace(/^\=/g,'').replace(/^\%3d/g,'').replace(/^\%3D/g,'').replace(/\%0A/g,encodeURIComponent('<br>')));
1161,1185d1047
<   if ((('' + location.hash)).indexOf('#data') == 0) {
<     newrun();
<     setTimeout(function(){ location.hash=''; }, 40000);
<   }
< }
< 
< function nomidway(incop) {
<   var outcop=incop.replace(/\|/g,' |').replace(/\,\ \|/g,',|');
<   var nextok=false;
<   var outcs=incop.replace(/\|/g,' |').replace(/\,\ \|/g,',|').split('|');
<   var il=0;
<   if (eval('' + outcs.length) > 1) {
<      il=eval('' + outcs.length);
<      outcs.push(',');
<      for (var iil=0; iil<il; iil++) {
<        if (!nextok && (outcs[eval(1 + iil)] + ' ').substring(0,1).replace('~',',').replace('`',',').replace('|',',') != ',') {
<           outcop=(outcop.replace(outcs[iil] + '|', outcs[iil] + ' |,')).replace(/\,\|\,/g, ',|').replace(/\,\ \|\,/g, ',|');
<           nextok=true;
<        } else {
<           if (outcs[iil].replace(/\,$/g,'') != outcs[iil]) { nextok=true; } else {  nextok=false; }
<        }
<      }
<   }
<   //if (outcop != incop) {   alert('incop=' + incop + ' becomes outcop=' + outcop.replace(/\ \|\,/g, '~!~!').replace(/\ \|/g,' |,').replace(/\~\!\~\!/g, ' |,')); }
<   return outcop.replace(/\ \|\,/g, '~!~!').replace(/\ \|/g,' |,').replace(/\~\!\~\!/g, ' |,'); 
1189d1050
<    var andnext=' and ';
1194c1055
<    xenterall=prompt('Optionally enter a # (hashtag) delimited composite field scenario to apply for next input data (perhaps CSV) file application, such as in examples below where +-*^%/ (maths) and !<>= (conditions) and ~` (for ascending descending order) and | (for OR rather than AND conditions).  ' + String.fromCharCode(10) + 'Examples ...' + String.fromCharCode(10) + '#1,3&2&4' + String.fromCharCode(10) + '#1&4,3+2' + String.fromCharCode(10) + '#1&4,3&2,2>100|2<-100,`2', '');
---
>    xenterall=prompt('Optionally enter a # (hashtag) delimited composite field scenario to apply for next input data (perhaps CSV) file application, such as in examples below where +-*^%/ (maths) and !<>= (conditions) and ~| (for ascending descending order).  ' + String.fromCharCode(10) + 'Examples ...' + String.fromCharCode(10) + '#1,3&2&4' + String.fromCharCode(10) + '#4,2*3' + String.fromCharCode(10) + '#1&4,3+2' + String.fromCharCode(10) + '#1&4,3&2,2>100,|2', '');
1213c1074
<         var csfs=nomidway(compstuff).split(','), tw='';
---
>         var csfs=compstuff.split(','), tw='';
1219,1225d1079
<                  if (csfs[ibn].replace(/\|$/g,'') != csfs[ibn]) {
<                  wheresor.push(' or ');
<                  andnext=' or ';
<                  } else {
<                  wheresor.push(andnext);
<                  andnext=' and ';
<                  }
1228,1234d1081
<                  if (csfs[ibn].replace(/\|$/g,'') != csfs[ibn]) {
<                  wheresor.push(' or ');
<                  andnext=' or ';
<                  } else {
<                  wheresor.push(andnext);
<                  andnext=' and ';
<                  }
1236c1083
<               wheres.push(' ' + csfs[ibn].replace(/\|$/g, ' OR '));
---
>               wheres.push(' ' + csfs[ibn]);
1244,1245c1091,1092
<             } else if (csfs[ibn].trim().replace('`','|').replace('~','|').indexOf('|') == 0) { // order by
<               orderbys.push((' ' + (csfs[ibn] + ' ').replace(/\|\ $/g,' |').replace(' | ',' |1 ').replace(' ~ ',' ~1 ').replace(' ` ',' |1 ')));
---
>             } else if (csfs[ibn].replace('~','|').indexOf('|') != -1) { // order by
>               orderbys.push(' ' + (csfs[ibn] + ' ').replace('| ','|1 ').replace('~ ','~1 '));
1300d1146
<    simplegroupby='';
1451d1296
<    simplegroupby='';
1747c1592
<    var recsare=[], newc='', ijk=0, exa='', zero=0, ipo=0, hrcols=[], jcol=-1;
---
>    var recsare=[], newc='', ijk=0, exa='', zero=0, ipo=0;
1754,1755d1598
<               hrcols=headrec.replace(/\"/g,'').toLowerCase().split(',');
<               hrcols[eval(-1 + hrcols.length)]=hrcols[eval(-1 + hrcols.length)].split(' //')[0].split('// ')[0].trim();
1767c1610
<      orderbys[ipo]=orderbys[ipo].replace(/\`/g, '|');
---
>      
1782,1783c1625
<      } else if (orderbys[ipo].trim().indexOf('|') == 0) {
<      //alert('orderbys[ipo]=' + orderbys[ipo] + ' amongst ' + document.getElementById('thname').innerHTML + ',' + document.getElementById('thquantity').innerHTML);
---
>      } else if (orderbys[ipo].indexOf('|') != -1) {
1785,1794d1626
<      if (eval('' + hrcols.length) > icol && eval('' + (document.getElementById('thname').innerHTML + ',' + document.getElementById('thquantity').innerHTML).toLowerCase().split(',').length) >= eval('' + orderbys[ipo].trim().substring(1).split('|')[0].split(' ')[0].split(' OR')[0])) {
<        if (hrcols[icol] != (document.getElementById('thname').innerHTML + ',' + document.getElementById('thquantity').innerHTML).toLowerCase().split(',')[icol]) {
<           for (jcol=0; jcol<hrcols.length; jcol++) {
<              if (hrcols[jcol] == (document.getElementById('thname').innerHTML + ',' + document.getElementById('thquantity').innerHTML).toLowerCase().split(',')[icol]) {
<                  orderbys[ipo]=orderbys[ipo].replace('' + (1 + icol), '' + (1 + jcol));
<                  icol=jcol;
<              }
<           }
<        }
<      } 
1830,1839d1661
<      if (eval('' + hrcols.length) > icol && eval('' + (document.getElementById('thname').innerHTML + ',' + document.getElementById('thquantity').innerHTML).toLowerCase().split(',').length) >= eval('' + orderbys[ipo].trim().substring(1).split('|')[0].split(' ')[0].split(' OR')[0])) {
<        if (hrcols[icol] != (document.getElementById('thname').innerHTML + ',' + document.getElementById('thquantity').innerHTML).toLowerCase().split(',')[icol]) {
<           for (jcol=0; jcol<hrcols.length; jcol++) {
<              if (hrcols[jcol] == (document.getElementById('thname').innerHTML + ',' + document.getElementById('thquantity').innerHTML).toLowerCase().split(',')[icol]) {
<                  orderbys[ipo]=orderbys[ipo].replace('' + (1 + icol), '' + (1 + jcol));
<                  icol=jcol;
<              }
<           }
<        }
<      } 
1887,1931d1708
< 
< function newrun() {
<      rawhtml=headrec + String.fromCharCode(10);
<      recsare=thiscont.split('<br>');
<      for (var ijk=0; ijk<recsare.length; ijk++) {
<         if (recsare[ijk] != headrec && recsare[ijk].indexOf(' ') != -1 && recsare[ijk].indexOf(',') != -1) {
<         rawhtml+=recsare[ijk].replace(' ',',') + String.fromCharCode(10);
<         }
<      }
<      if (1 == 1) {
<      setTimeout(function(){ 
<      if (('' + location.hash).indexOf('#data') == 0) {
<        document.getElementById('tdname').innerHTML='';
<        document.getElementById('tdquantity').innerHTML='';
<        thiscont=decodeURIComponent(('' + location.hash).substring(5).replace(/^\=/g,'').replace(/^\%3d/g,'').replace(/^\%3D/g,'').replace(/\%0A/g,encodeURIComponent('<br>'))).split(' ! sqlisyellow !')[0];
<        if (decodeURIComponent(('' + location.hash)).indexOf(' ! sqlis ! ') != -1) {
<           sqlis=decodeURIComponent(('' + location.hash)).split(' ! sqlis ! ')[1];
<           document.body.title=sqlis;
<               headrec=sqlis.split('SELECT ')[1].split('<')[0].split(' FROM ')[0].trim();
<               efields=headrec.replace(/\"/g,'').split(',');
<               for (var ke=0; ke<efields.length; ke++) {
<                  eval('mappings.unshift({ from: "' + eval(ke + 1) + '", to: "' + efields[ke] + '"})');
<               }
<               document.getElementById('topic').innerHTML=headrec.replace(/^\"/g,'').substring(0).split('"')[0].split(',')[1].substring(0,1).toUpperCase() + headrec.replace(/^\"/g,'').substring(0).split('"')[0].split(',')[1].substring(1);
<               document.getElementById('thname').innerHTML=maybenotdefn(headrec.replace(/^\"/g,'').substring(0).split('"')[0].split(',')[1].substring(0,1).toUpperCase() + headrec.replace(/^\"/g,'').substring(0).split('"')[0].split(',')[1].substring(1));
<               document.getElementById('thquantity').innerHTML=maybenotdefq(headrec.replace(/^\"/g,'').substring(0).split('"')[0].split(',')[0].substring(0,1).toUpperCase() + headrec.replace(/^\"/g,'').substring(0).split('"')[0].split(',')[0].substring(1));
<               //analwheres();
< 
<        }
<        if (decodeURIComponent(('' + location.hash)).indexOf(' ! sqlisyellow ! ') != -1) {
<           sqlisyellow=decodeURIComponent(('' + location.hash)).split(' ! sqlisyellow ! ')[1].split(' ! sqlis ')[0];
<           document.getElementById('demo').title=sqlisyellow;
<        }
<        setTimeout(function(){ document.getElementById('tdname').innerHTML=''; document.getElementById('tdquantity').innerHTML=''; document.getElementById('demo').innerHTML=process(decodeURIComponent(('' + location.hash).substring(5).replace(/^\=/g,'').replace(/^\%3d/g,'').replace(/^\%3D/g,'').replace(/\%0A/g,encodeURIComponent('<br>')))); }, 3000);
<      }
<      document.getElementById('demo').innerHTML=thiscont; 
<      if (xsqlis != '' && xsqlisyellow.indexOf('GROUP BY ') != -1) {
<      document.body.title=xsqlis; 
<      document.getElementById('demo').title=xsqlis + ' GROUP BY ' + xsqlisyellow.split('GROUP BY ')[1]; 
<      }
<      }, 8000);
<      } else {
<      askall(rawhtml);
<      }
< }