reset status in getCache following put with nowtaccess error

.gitignore

@@ -1,6 +1,7 @@
 *~
 *.bak
 *.*-
+RHEL7-x86_64
 SL6-x86_64
 windows-x64
 felix-cache

example.m

@@ -1 +0,0 @@
-exampleNew.m

macchinettaHelper.h

@@ -1,4 +1,5 @@
 #include <cafe.h>
+//include <hashConduit.h>
 #include "macchinetta.h"
 #include "containerMochaccino.h"
 
@@ -11,6 +12,7 @@ using namespace std;
 
 const unsigned short METHOD_NAME_MAX_SIZE=80;
 const unsigned short PVNAME_MAX_SIZE=80;
+const unsigned short DBR_STRING_MAX_SIZE=40;
 
 const unsigned short MONITOR_ACTION_MAX_SIZE=255;
 const unsigned short ME_MESSAGE_MAX_SIZE=255;
@@ -213,8 +215,8 @@ enum mochaIndex {SHOW=1, OPEN, OPEN_ARRAY, OPEN_WAIT, GET_OPEN_WAIT_TIME,
                  SET_NELEM, SET_NELEM_CACHE, SET_OFFSET,
                  GET_NELEM_CLIENT, GET_NELEM_NATIVE, GET_NELEM_REQUEST,
                  GET_NELEM, GET_NELEM_CACHE, GET_OFFSET,
-                 MONITOR=400, MONITOR_STOP, MONITOR_FLUSH_EVENT,
-                 GET_MONITOR_HANDLES, GET_MONITOR_HANDLES_AND_ACTIONS,
+                 MONITOR=400, MONITOR_STOP, MONITOR_FLUSH_EVENT, 
+                 GET_MONITOR_HANDLES, GET_MONITOR_HANDLES_AND_ACTIONS, GET_NO_MONITORS,
                  IS_CONNECTED=500, ALL_CONNECTED,
                  PRINT_STATUS=600, PRINT_MONITORS, PRINT_HANDLE, PRINT_HANDLES,
                  PRINT_DISCONNECTED_HANDLES,GET_HANDLES,GET_HANDLE_STATES,
@@ -397,10 +399,12 @@ void msInsert()
 
     ms.insert(mochaccino(GET_OFFSET,    "getoffset"));
 
+    ms.insert(mochaccino(MONITOR,       "monitorstart"));
     ms.insert(mochaccino(MONITOR,       "monitor"));
     ms.insert(mochaccino(MONITOR_STOP,  "monitorstop"));
     ms.insert(mochaccino(MONITOR_FLUSH_EVENT,  "monitorflushevent"));
-
+		
+    ms.insert(mochaccino(GET_NO_MONITORS,  "getnomonitors"));
     ms.insert(mochaccino(GET_MONITOR_HANDLES,  "getmonitorhandles"));
     ms.insert(mochaccino(GET_MONITOR_HANDLES_AND_ACTIONS,  "getmonitorhandlesandactions"));
 
@@ -456,6 +460,15 @@ void printStatus(int status )
 }
 
 
+void printStringInputError()
+{
+    mexPrintf("Error in intepreting pv in input argument:\n");
+    mexPrintf("PV name does not have a char value \n");
+    mexPrintf("MATLAB mx library does not support string/mxSTRING_CLASS as input\n");
+    mexPrintf("Please use char/mxCHAR_CLASS as data type instead\n");
+	  mexPrintf("i.e., use single quotes instead of double quotes in input argument!\n");
+}
+
 std::string prepareExceptionID(int status )
 {
     std::string exID="CAFE_";
@@ -771,6 +784,56 @@ unsigned int getNObjectsFromDataCell(const mxArray * thisCell)
 }
 
 
+char getEscapeSequence(char cNext, bool & recognizedFlag)  {
+    char wfChar = cNext;
+    recognizedFlag = true;
+  
+    switch (cNext) {
+        case '0':
+	    wfChar = '\0'; 
+            break;
+	case '\'':
+	    wfChar = '\''; 
+            break;
+        case '"':
+	    wfChar = '\"'; 
+            break;
+	case '?':
+	    wfChar = '\?'; 
+            break;
+	case '\\':
+	    wfChar = '\\'; 
+            break;
+        case 'a':
+	    wfChar = '\a'; 
+            break;
+	case 'b':
+	    wfChar = '\b'; 
+            break;
+        case 'f':
+	    wfChar = '\f'; 
+            break;
+	case 'n':
+	    wfChar = '\n'; 
+            break;
+        case 'r':
+	    wfChar = '\r'; 
+            break;
+	case 't':
+	    wfChar = '\t'; 
+            break;
+        case 'v':
+	    wfChar = '\v'; 
+            break;
+	default:
+            // Unrecognized escape sequence; print slash 
+	    wfChar = '\\';   
+            recognizedFlag = false;                
+	    break;
+    }
+    
+    return wfChar;
+}
 
 
 /*
@@ -910,15 +973,93 @@ void cellToString(const mxArray * thisCell)
 
                 break;
             case mxCHAR_CLASS:
-                ne=1;
-                dbr_string_t * strBuffer = new dbr_string_t[ne];
-                mxGetString(newCell, *strBuffer, sizeof(dbr_string_t)*ne);
-                for (mwIndex j=0; j< ne; ++j )
-                {
-                    strcpy(inputStringCell[iWithinAllCells],strBuffer[j]);
+	        unsigned int neLocal=1;
+                
+                if (ne > (DBR_STRING_MAX_SIZE-1))  {
+		    mexPrintf("Exceeded (with %d) max limit of %d chars. Ignoring this element of cell\n", 
+                            ne, (DBR_STRING_MAX_SIZE-1));
+                    break;
+		}
+                             
+
+                dbr_string_t * strBuffer = new dbr_string_t[neLocal];
+                mxGetString(newCell, *strBuffer, sizeof(dbr_string_t)*neLocal);
+                //mexPrintf("ne %d\n", ne);
+                //mexPrintf("strBuffer %d\n", *strBuffer[0]);
+                //mexPrintf("strBuffer %c \n", *strBuffer[0]);
+                char c =  strBuffer[0][0];  	
+                char cNext;
+                if (c == '\\' && ne > neLocal) {
+		
+	          cNext = strBuffer[0][1]; 
+		  //mexPrintf("char cNext %c\n", cNext);
+                  bool recognizedFlag = true; 
+                  
+                  char cNew = NS_MOCHA::getEscapeSequence(cNext, recognizedFlag);
+                  //Must loop over all ne!
+                  for (unsigned int i=0; i < ne; ++i) { 
+		    strBuffer[0][i] = cNew;
+                  }
+                  /* Must loop over all ne
+		  switch (cNext) {
+		   case '0':
+		      strBuffer[0][0] = '\0';                  
+                      break;
+                   case '\'':
+		      strBuffer[0][1]  = '\''; 
+                      break;
+                   case '"':
+		      strBuffer[0][1]  = '\"'; 
+                      break;
+		   case '?':
+		      strBuffer[0][1]  = '\?'; 
+                      break;
+		   case '\\':
+		      strBuffer[0][1]  = '\\'; 
+                      break;
+                   case 'a':
+		      strBuffer[0][1]  = '\a'; 
+                      break;
+		   case 'b':
+		      strBuffer[0][1]  = '\b'; 
+                      break;
+                   case 'f':
+		      strBuffer[0][1]  = '\f'; 
+                      break;
+		   case 'n':
+		     //strBuffer[0][0]  = '\n';
+                       for (unsigned int i=0; i < ne; ++i) {
+		         strBuffer[0][i]  = '\n';
+                       } 		      
+                      break;
+                   case 'r':
+		      strBuffer[0][1]  = '\r'; 
+                      break;
+		   case 't':
+		      //strBuffer[0][0]  = '\t';
+		      for (unsigned int i=0; i < ne; ++i) {
+		       strBuffer[0][i]  = '\t';
+                       }  		    
+                      break;
+                   case 'v':
+		      strBuffer[0][1]  = '\v'; 
+                      break;
+		   default:
+                     // Unrecognized escape sequence; print slAH
+		      strBuffer[0][1]  = '\\';                 
+		      break;
+                   }
+		  */
+		}
+		 
+
+                for (mwIndex j=0; j< neLocal; ++j )
+                {		    
+		  strcpy(inputStringCell[iWithinAllCells], strBuffer[j]);
                     ++iWithinAllCells;
                 }
                 delete [] strBuffer;
+               
                 break;
             }
 
@@ -1188,6 +1329,7 @@ unsigned  int checkForHandleNoOpen(const mxArray * inputValue)
     if (mxIsNumeric(inputValue) )
     {
         _handle = (uint32_T) mxGetScalar(inputValue);
+				 
     }
 
     else if (mxIsChar(inputValue) )
@@ -1206,6 +1348,8 @@ unsigned  int checkForHandleNoOpen(const mxArray * inputValue)
         }
 
     }
+		
+	
     else if (mxIsCell(inputValue) )
     {
 
@@ -1231,8 +1375,21 @@ unsigned  int checkForHandleNoOpen(const mxArray * inputValue)
                 mexPrintf("PV=%s has not yet been opened by user!\n", pv );
             }
         }
+				
+				else if (strcmp (mxGetClassName(newCell),"string") ==0 ) {
+				    printStringInputError();
+    		    return _handle;;
+        }
+				
 
     }
+		else if (strcmp (mxGetClassName(inputValue),"string") ==0 ) {
+			      printStringInputError();   
+    		    return _handle;;
+    }
+		
+		
+		
     else
     {
         mexPrintf("Error in checkForHandleNoOpen:\n");
@@ -1248,6 +1405,8 @@ unsigned  int checkForHandle(const mxArray * inputValue)
 {
 
     unsigned  int _handle=0;
+		
+		
 
     if (mxIsNumeric(inputValue) )
     {
@@ -1297,7 +1456,20 @@ unsigned  int checkForHandle(const mxArray * inputValue)
                 _handle=open(pv);
             }
         }
+				 
+        else if (strcmp (mxGetClassName(newCell),"string") ==0 ) {
+						printStringInputError();
+    		    return _handle;;
+        }
+				
     }
+		
+		 
+    else if (strcmp (mxGetClassName(inputValue),"string") ==0 ) {
+			  printStringInputError();
+    		return _handle;;
+    }
+		
     else
     {
         mexPrintf("Error in checkForHandle:\n");
@@ -1305,9 +1477,11 @@ unsigned  int checkForHandle(const mxArray * inputValue)
         mexPrintf("or PV name does not have a char value \n");
         return _handle;
     }
-    if (_handle==0)
+    if (_handle<1)
     {
         mexPrintf("Handle in input argument not given! \n");
+				mexPrintf("Handle should be a positive integer. \n");
+				mexPrintf("Alternatively enter the pv name in single quotes\n");
     }
     return _handle;
 }

macchinettaSwitch.cpp

@@ -12,7 +12,6 @@
 //#include <Python.h>
 //#endif
 
-
 extern void _main();
 using namespace NS_MOCHA;
 
@@ -43,33 +42,31 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
             mexPrintf("Please use the method name (MATLAB char) as input to the first argument. \n");
             mexPrintf("The command: mocha \'show\' will display the methods available. \n");
 
-            mexPrintf("1st input argument Class Name: %s\n", mxGetClassName(prhs[0]));
-            mexPrintf("1st input argument Class ID:   %d\n", mxGetClassID(prhs[0]));
-            mexPrintf("1st input argument to mocha must be of type char/mxCHAR_CLASS\n");
+            //mexPrintf("1st input argument given has Class Name: %s\n", mxGetClassName(prhs[0]));
+            //mexPrintf("1st input argument given has Class ID:   %d\n", mxGetClassID(prhs[0]));
+            //mexPrintf("1st input argument to mocha must be of type char/mxCHAR_CLASS\n");
 
             return;
         }
     }
-
-
-    /*
+           
+    
     if (strcmp (mxGetClassName(prhs[0]),"string") ==0 ) {
 
-    	  mxChar * mess2 = static_cast<mxChar*>(mxGetData(prhs[0]));
 
-    	  mData = (mxArray *) mess2;
-      messLength = METHOD_NAME_MAX_SIZE+1;
+    	  //mxChar * mess2 = static_cast<mxChar*>(mxGetData(prhs[0]));
+    	  //mData = (mxArray *) mess2;
+        //messLength = METHOD_NAME_MAX_SIZE+1;
 
-      if ( mxGetString(mData, mess, messLength) == 1) {
-    				mexPrintf ("mxGetString has failed; input is not of mxChar type\n");
-    		}
+        //if ( mxGetString(mData, mess, messLength) == 1) {
+    		//		mexPrintf ("mxGetString has failed; input is not of mxChar type\n");
+    		//}
 
-    		mexPrintf ("mocha does not support string/mxSTRING_CLASS as input\n");
-    		mexPrintf ("Please use char/mxCHAR_CLASS as data type for input\n");
+    		mexPrintf ("MATLAB mx library does not support string/mxSTRING_CLASS as input\n");
+    		mexPrintf ("Please use char/mxCHAR_CLASS as data type instead\n");
+		mexPrintf("i.e., use single quotes instead of double quotes in input argument!\n");
     		return;
-    	}
-    else {
-    	*/
+   }
     //message
 
     //Trick to handle mocha(402) input from monitor Action
@@ -77,14 +74,32 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
     messLength = METHOD_NAME_MAX_SIZE+1;
     if (mxIsChar(prhs[0]) )
     {
-        mData = (mxArray *)  prhs[0];
+        mData = (mxArray *) prhs[0];
         mxGetString(mData, mess, messLength);
     }
+		else if (!strcmp(mxGetClassName(prhs[0]), "string") )
+		{			
+		
+       mexPrintf("1st input argument given has Class Name: %s\n", mxGetClassName(prhs[0]));
+       mexPrintf("1st input argument given has Class ID:   %d\n", mxGetClassID(prhs[0]));
+       mexPrintf("1st input argument to mocha must be of type char/mxCHAR_CLASS\n");
+       mexPrintf("Please use single quotes instead of double quotes in input argument!\n");
+				
+		   return;
+		}
     else if (mochaIndex ==MONITOR_FLUSH_EVENT)
     {
         strcpy(mess,"monitorflushevent");
     }
+	  else
+		{	    
+        mexPrintf("1st input argument given has Class Name: %s\n", mxGetClassName(prhs[0]));
+        mexPrintf("1st input argument given has Class ID:   %d\n", mxGetClassID(prhs[0]));
+				mexPrintf("1st input argument to mocha must be of type char/mxCHAR_CLASS\n");
+		    return;
+		}
 
+   
 
     char messOriginal[METHOD_NAME_MAX_SIZE+1];
     strcpy(messOriginal,mess);
@@ -167,6 +182,7 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
 
     //mexPrintf("message %s\n", mess);
     //mexPrintf("message %s\n", messString.c_str());
+	
 
     it_name = name_index.find(mess);
 
@@ -325,14 +341,12 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
 
     case SET:
 
-
         if (nrhs<3)
         {
             mexPrintf("Invalid Number of argument %d. Input: 'set', handle/pv, data \n", nrhs);
             return;
         }
 
-
         if (mxIsChar(prhs[1]))
         {
             nh=1;
@@ -421,9 +435,7 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
         }
         else
         {
-
             nh=mxGetNumberOfElements (prhs[1]);
-
         }
 
         ///mexPrintf("nh=%d, nargin=%d\n", nh, nrhs);
@@ -489,7 +501,7 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
         break;
 
     case MOCHA_VERSION:
-        plhs[0]=mxCreateString((char *) "mocha-1.8.0 : 14 December 2018");
+        plhs[0]=mxCreateString((char *) "mocha-1.14.4 : 14 October 2021");
         break;
 
     case SHOW:
@@ -1044,8 +1056,9 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
         xData = (mxArray *)  prhs[1];
         pvLength = PVNAME_MAX_SIZE+1;
         mxGetString(xData, pv, pvLength);
-
+       
         handle=NS_MOCHA::open(pv);
+       
 
         //return handle
         //plhs[0] = mxCreateDoubleScalar(handle);
@@ -1351,7 +1364,6 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
                 (du[j].getPVName(),pvgroup.getGroupHandle());
 
 
-
             //Match INPUT to CAFE DATATYPE
             if (mdtIndexOriginal==MOCHA_NATIVE)
             {
@@ -2599,19 +2611,14 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
     case GET:
     {
 
-
-
         if (nrhs<2)
         {
             mexPrintf("Invalid Number of argument %d. Input:  message, handle/pv \n", nrhs);
             return;
         }
 
-
-
         handle=checkForHandle(prhs[1]);
 
-
         if(handle==0)
         {
             mexPrintf("Handle does not exist!\n");
@@ -2640,11 +2647,8 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
         if (mdtIndex==MOCHA_NATIVE)
         {
 
-
-
             status=cafe.getHandleHelper().getDataTypeRequest(handle, rdt);
 
-
             if (status!=ICAFE_NORMAL)
             {
                 mexPrintf("Error for handle input= %d \n", (uint32_T) mxGetScalar(prhs[1]) );
@@ -2657,14 +2661,11 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
             CAFE_DATATYPE cdt = (CAFE_DATATYPE) rdt;
 
 
-
             mdtIndex=getMdtIndexFromCafeDataType(cdt);
 
 
-
             if (cafe.getHandleHelper().isEnum(handle))
             {
-
                 mdtIndex=MOCHA_STRING;
             }
         }
@@ -2672,7 +2673,6 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
         nelem = cafe.getHandleHelper().getNelemClient(handle); //Change Request to Client
 
 
-
         if (cafe.getHandleHelper().getOffset(handle) > 0 )
         {
 
@@ -2697,12 +2697,10 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
 
             //mexPrintf("get Cache: nelem = %d \n", nelem);
 
-
             if ( 	(cafe.getHandleHelper().getOffsetLast(handle) > 0) ||
                     (cafe.getHandleHelper().getNelemToRetrieveFromCache(handle) > cafe.getHandleHelper().getNelemRequest(handle)))
             {
 
-
                 //if (nelem > cafe.getHandleHelper().getNelemRequest(handle)  ) {
                 nelemPrevious=cafe.getHandleHelper().getNelemToRetrieveFromCache(handle);
                 nelem = min( (unsigned int) nelem, cafe.getHandleHelper().getNelemRequest(handle)-cafe.getHandleHelper().getOffsetLast(handle));
@@ -2716,6 +2714,14 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
 
         }
 
+        //special case for wf with dbr_char_t
+        ChannelRegalia channelInfo;
+	status=cafe.getChannelInfo(handle, channelInfo);      
+        unsigned int WFWithString = 0;
+        if (channelInfo.getClassNameAsString().compare("waveform") ==0) {
+	    WFWithString = 1;
+        }
+
         switch (mdtIndex)
         {
         case MOCHA_DOUBLE:
@@ -2786,57 +2792,91 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
             break;
 
         case MOCHA_UCHAR:
-            plhs[0] = mxCreateNumericMatrix(1,nelem,mxUINT8_CLASS,  mxREAL);
-            ucharArray = (uint8_T *)  mxGetData (plhs[0]);
-            if(cacheFlag)
-            {
-                status=cafe.getCache(handle,ucharArray);
-            }
-            else
-            {
-                status=cafe.get(handle,ucharArray);
-            }
+
+	    //special case for wf with dbr_char_t
+	  /*
+            if (WFWithString == 1) {
+
+                string wfStr;
+
+                if (cacheFlag)
+                {
+                   status=cafe.getWFAsStringCache(handle,wfStr);
+                }
+                else
+                {
+                   status=cafe.getWFAsString(handle,wfStr);
+                }
+
+                plhs[0] = mxCreateString( wfStr.c_str() );
+            } 
+            else {
+	   */
+                plhs[0] = mxCreateNumericMatrix(1,nelem,mxUINT8_CLASS,  mxREAL);
+                ucharArray = (uint8_T *)  mxGetData (plhs[0]);
+                if(cacheFlag)
+                {
+                    status=cafe.getCache(handle,ucharArray);
+                }
+                else
+                {
+                    status=cafe.get(handle,ucharArray);
+                }
+	    //}
             break;
 
         case MOCHA_STRING:
         {
-            dbr_string_t * stringArrayc = new dbr_string_t[nelem];
 
-            if(cacheFlag)
-            {
-                status=cafe.getCache(handle,stringArrayc);
-            }
-            else
-            {
-                status=cafe.get(handle,stringArrayc);
-            }
+            if (WFWithString ==1) {
 
-            //char *test[40];
-            //test[0]="test";
-            //test[1]="again";
-            //mxChar  *pr;
-            //char    *ptr_to_seed_data;
-            //int      c;
+                string wfStr;
 
-
-            if (status==ICAFE_NORMAL)
-            {
-
-                if (nelem==1)
+                if (cacheFlag)
                 {
-                    plhs[0]=mxCreateString( stringArrayc[0] );
+                   status=cafe.getWFAsStringCache(handle,wfStr);
                 }
                 else
                 {
-                    plhs[0] = mxCreateCellMatrix(1,nelem);
-                    for (mwSignedIndex i=0; i <nelem; ++i)
-                    {
-                        mxSetCell (plhs[0], i, mxCreateString( stringArrayc[i] ));
-                    }
+                   status=cafe.getWFAsString(handle,wfStr);
                 }
-            }
 
-            delete [] stringArrayc;
+                plhs[0] = mxCreateString( wfStr.c_str() );
+            } 
+            else {
+
+
+                dbr_string_t * stringArrayc = new dbr_string_t[nelem];
+
+                if(cacheFlag)
+                {
+                    status=cafe.getCache(handle,stringArrayc);
+                }
+                else
+                {
+                    status=cafe.get(handle,stringArrayc);
+                }
+         
+
+                if (status==ICAFE_NORMAL)
+                {
+
+                    if (nelem==1)
+                    {
+                        plhs[0]=mxCreateString( stringArrayc[0] );
+                    }
+                    else
+                    {
+                        plhs[0] = mxCreateCellMatrix(1,nelem);
+                        for (mwSignedIndex i=0; i <nelem; ++i)
+                        {
+                            mxSetCell (plhs[0], i, mxCreateString( stringArrayc[i] ));
+                        }
+                    }
+                 }
+
+                delete [] stringArrayc;
+            }
             break;
         }
 // Non DBR_TYPES
@@ -2997,11 +3037,11 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
 
         if (cacheFlag)
         {
-            status=cafe.getWFAsString(handle,wfStr);
+            status=cafe.getWFAsStringCache(handle,wfStr);
         }
         else
         {
-            status=cafe.getWFAsStringCache(handle,wfStr);
+            status=cafe.getWFAsString(handle,wfStr);
         }
 
         //plhs[0] = mxCreateCellMatrix(1,2);
@@ -4236,7 +4276,7 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
 
         size_t ne = mxGetNumberOfElements ( prhs[2]);
 
-        if(ne==0)
+        if (ne==0)
         {
             mexPrintf("Empty Data Array in Input \n");
             return;
@@ -4246,21 +4286,34 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
         neWithinAllCells=0;
         iWithinAllCells=0;
 
-        mxClassID mxid =mxGetClassID( prhs[2]);
-
+        mxClassID mxid =mxGetClassID(prhs[2]);
+        
+       
         //This line is important for a string as the Number of Elements
         //is interpreted as the number of characters!!!
         //Hence for ne to be 1
+        //Unless we have the special case of wf and DBR_CHAR
+        //So let us first check if this is a waveform
+             
+        unsigned short isWFWithString=0;
+
         if (mxid==mxCHAR_CLASS)
         {
-            ne=1;
+	   ChannelRegalia channelInfo;
+	   status=cafe.getChannelInfo(handle, channelInfo);      
+           //mexPrintf(channelInfo.getClassNameAsString().c_str());
+           if (channelInfo.getClassNameAsString().compare("waveform") !=0) {
+               ne=1;	       
+	   }
+           else {
+	     isWFWithString = 1;
+	   }
         }
 
         nelem = cafe.getHandleHelper().getNelemClient(handle);
 
-
         //handle does not exist
-        if(nelem==0)
+        if (nelem==0)
         {
             //status
             plhs[0] = mxCreateNumericMatrix(1,1,mxINT32_CLASS,mxREAL);
@@ -4275,11 +4328,12 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
             return;
         }
 
-        if(nelem!=ne)
+        if (nelem!=ne)
         {
             cafe.getHandleHelper().setNelem(handle,ne);
         }
 
+
         mxArray *fout;
         switch(mxid)
         {
@@ -4360,11 +4414,13 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
 
             scanCell(prhs[2]);
 
+            //Is it a waveform??
+            //If neWithinAllCells =1 and wf and class is mx_char
+
             inputStringCell = new dbr_string_t[neWithinAllCells];
 
             cellToString(prhs[2]);
 
-
             if(neWithinAllCells!=ne)
             {
                 cafe.getHandleHelper().setNelem(handle,neWithinAllCells);
@@ -4377,17 +4433,132 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
         }
         // Single String
         case mxCHAR_CLASS:
-            dbr_string_t  inputString;;
-            mxGetString(prhs[2], inputString, sizeof(dbr_string_t));
-            status=cafe.set(handle, inputString);
+          char *buf;
+          
+          size_t buflen;
+          buflen = mxGetN(prhs[2]) + 1;
+          /*
+	  buf = (char *) mxMalloc(buflen);
 
-            break;
+          long mexStatus;
+
+          mexStatus = mxGetString(prhs[2], buf, (mwSize) buflen+10);
+	  if (mexStatus != 0) {
+            mexWarnMsgIdAndTxt( "MATLAB:mxmalloc:mxGetString", 
+                           "Failed to copy input string into allocated memory.");
+            status = ECAFE_BADSTR;
+          }
+	  */
+          buf=mxArrayToString(prhs[2]);
+         
+	  if (isWFWithString == 1) {
+            //std::string tempStr = inputString;
+	    dbr_char_t * wfChar =  new dbr_char_t [buflen+1];
+            //dbr_char_t * setStrValues =  (dbr_char_t *) mxMalloc(buflen+40); // new dbr_char_t  [buflen];
+	    std::string wfStr = buf; 
+            unsigned short iCount = 0;
+	    for (std::string::size_type i=0; i < wfStr.size(); ++i) {
+              char c =  wfStr[i];
+             
+              char cNext;
+              if (c == '\\' && i <  (wfStr.size()-1)) {
+		
+	         cNext = wfStr[i+1]; 
+                 bool recognizedFlag = true; 
+                 wfChar[iCount] = NS_MOCHA::getEscapeSequence(cNext, recognizedFlag);
+                 //mexPrintf ("wf %d",  wfChar[iCount]);
+                 /*
+		 switch (cNext) {
+		    case '0':
+		     wfChar[iCount] = '\0'; 
+                     break;
+		   case '\'':
+		     wfChar[iCount] = '\''; 
+                     break;
+                   case '"':
+		     wfChar[iCount] = '\"'; 
+                     break;
+		   case '?':
+		     wfChar[iCount] = '\?'; 
+                     break;
+		   case '\\':
+		     wfChar[iCount] = '\\'; 
+                     break;
+                   case 'a':
+		     wfChar[iCount] = '\a'; 
+                     break;
+		   case 'b':
+		     wfChar[iCount] = '\b'; 
+                     break;
+                   case 'f':
+		     wfChar[iCount] = '\f'; 
+                     break;
+		   case 'n':
+		     wfChar[iCount] = '\n'; 
+                     break;
+                   case 'r':
+		     wfChar[iCount] = '\r'; 
+                     break;
+		   case 't':
+                     mexPrintf ("wf %c",  wfChar[iCount]);
+		     wfChar[iCount] = '\t'; 
+                     mexPrintf ("wf %c",  wfChar[iCount]);
+                     break;
+                   case 'v':
+		     wfChar[iCount] = '\v'; 
+                     break;
+		   default:
+                     // Unrecognized escape sequence; print slash and subsequent letter
+		     wfChar[iCount] = '\\'; 
+                     --i;
+		     break;
+                 }
+                 */
+		 //if (wfChar[iCount] !=  '\\') {
+		 if (recognizedFlag) {
+                    ++i;
+                    // mexPrintf ("wfplus i  %d %d",  wfChar[iCount], i);
+		 }	        
+              } 
+              else {
+		wfChar[iCount] = c; 
+              }     
+              ++iCount; 
+	      //setStrValues[i] = buf[i];  
+	    }
+
+            
+
+            cafe.getHandleHelper().setNelem(handle, iCount);
+	    //std::string tb = buf;
+            //strcpy(  (char*)(setStrValues), (const char*) buf); //"Hello \nWorld\0" );
+            //setStrValues =(dbr_char_t *) tb.c_str(); //"Hello\tWorld\nA\0"; //(dbr_char_t *) buf; //
+	    status = cafe.set(handle, wfChar); // ) (dbr_char_t *) buf);
+           
+            delete [] wfChar;
+            // mxFree(setStrValues);
+            
+          }
+          else {           
+            status=cafe.set(handle, buf);
+          }
+           
+         
+          mxFree(buf);
+ 
+          break;
 
         default:
+	  mexPrintf("mxClassID=%s (enum %d) is not supported; set not instigated!\n",
+                    mxGetClassName(prhs[2]), mxid);
+          mexPrintf("mxClassID=%s (enum %d) is supported; i.e., use single instead of double quotes!\n",
+                    "char", mxCHAR_CLASS); 
 
-            break;
+	  status = ECAFE_INVALID_SWITCH_CASE;
+          break;
         }
 
+       
         if(nelem!=ne) cafe.getHandleHelper().setNelem(handle,nelem); //back to old value
 
         //status
@@ -4408,9 +4579,6 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
     }
 
 
-
-
-
     case SET_AND_GET:
     {
         if (nrhs<3)
@@ -5361,6 +5529,39 @@ void macchinettaFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prh
         break;
     }
 
+     case GET_NO_MONITORS:
+    {
+		
+		   
+        if (nrhs<2)
+        {
+            mexPrintf("Invalid Number of argument %d. Input: 'getNoMonitors', handle/pv \n", nrhs);
+            return;
+        }
+        else if (nrhs>2)
+        {
+            mexPrintf("Ignoring arguments after the 2nd from the %d entered. Input: 'getNoMonitors', handle/pv \n", nrhs);
+        }
+
+        handle=checkForHandle(prhs[1]);
+        if(handle==0)
+        {
+            return;
+        }
+
+
+        unsigned int nm;
+        nm=cafe.getHandleHelper().getNmonitor(handle);
+
+        //number of monitors for this handle      
+        plhs[0] = mxCreateNumericMatrix(1,1,mxUINT32_CLASS,mxREAL);
+        ulongArray = (uint32_T *) mxGetData(plhs[0]);
+
+        ulongArray[0]=nm;
+        
+        break;
+    }
+
 
     case PRINT_MONITORS:
     {

makefile

@@ -1,135 +0,0 @@
-#
-# Jan Chrin
-# New Version: June 2016
-#
-# makefile to build mocha mex file
-# printenv | grep MATLAB to reveal your MATLAB Directory
-#
-# e.g. on sf-lc we have  
-# MATLAB=/afs/psi.ch/sys/linux/opt/matlab/2015a.x86_64
-#
-# local executables are built in  ./${EPICS_HOST_ARCH}/$(MVER)
-# where the MATLAB version is grepped from $(MATLAB)
-
-MATLAB_ROOT=${MATLAB}
-MATLAB_VERSION=$(notdir $(MATLAB_ROOT))
-
-##### CHANGE AS APPROPRIATE #################
-#Mocha Version to install
-MOCHA_VERSION=mocha-noqt-1.8.0-gcc-6.3.0
-#CAFE version to link to
-CAFE_VERSION=cafe-noqt-1.8.0-gcc-6.3.0
-
-
-EPICS_BASE=${EPICS}/base
-#CAFE project base
-CAFE_BASE=/opt/gfa/cafe
-CAFE_MOCHA_BASE=${CAFE_BASE}/mocha
-CAFE_CPP_BASE=$(CAFE_BASE)/cpp/$(CAFE_VERSION)
-BOOST_BASE=${CAFE_BASE}/boost/boost_1_61_0/include
-
-
-INSTALL_MOCHA_LIBDIR= $(CAFE_MOCHA_BASE)/$(MOCHA_VERSION)/lib/$(MATLAB_VERSION)
-#############################################
-
-
-#First deteremine if we are on a 32/64 bit machine
-#as mex file extensions are named differently
-pattern64=x86_64
-pattern32=i386
-
-PWD=$(shell pwd)
-      #hardware platform   
-      HW=$(shell uname -i)
-      ifeq ($(pattern64),$(findstring $(pattern64), $(HW)))
-        MEXE=mexa64
-	MATLAB_LIB = $(MATLAB_ROOT)/bin/glnxa64 
-      else
-    	ifeq ($(pattern32),$(findstring $(pattern32), $(HW)))	
-	  MEXE=mexglx
-	  MATLAB_LIB = $(MATLAB_ROOT)/bin/glnxa86 
-  	endif
-      endif
-
-
-INSTALL_PATH?=$(INSTALL_MOCHA_LIBDIR)
-OBJ_DIR= ${EPICS_HOST_ARCH}/$(MATLAB_VERSION)
-
-INCLUDEPATH_MOCHA += -I$(MATLAB_ROOT)/extern/include \
- -I$(CAFE_CPP_BASE)/include -I./ \
- -I$(EPICS_BASE)/include -I$(EPICS_BASE)/include/os/Linux 
-
-	
-INCLUDEPATH_MACHINETTA += $(INCLUDEPATH_MOCHA) -I$(BOOST_BASE) -I$(BOOST_BASE)/boost 
-
-		
-LIB_DIR +=  \
- -L$(EPICS_BASE)/lib/${EPICS_HOST_ARCH} \
- -Wl,-rpath,$(EPICS_BASE)/lib/${EPICS_HOST_ARCH} \
- -L$(MATLAB_LIB) -Wl,-rpath,$(MATLAB_LIB) 
-
-
-
-#-lboost_system -lboost_thread-mt
-LIBS +=  -ldl -lca -lCom  -lmx -lmex -lmat  
- 
-LIB_INSTALL = $(LIB_DIR) -L$(INSTALL_PATH) -Wl,-rpath,$(INSTALL_PATH)
-
-LIB_LOCAL   = $(LIB_DIR)
-
-CPP_OBJS=../cpp/src/libs/cafe/$(CAFE_VERSION_M)
-
-#CAFE_OBJS_DIR = $(CPP_OBJS)/cafe.o $(CPP_OBJS)/cafeCache.o $(CPP_OBJS)/cafeGroup.o $(CPP_OBJS)/cafeVectors.o \
-#			 $(CPP_OBJS)/cafeXML.o $(CPP_OBJS)/callbackHandlerCreate.o $(CPP_OBJS)/callbackHandlerMonitor.o \
-#			 $(CPP_OBJS)/conduitGroup.o $(CPP_OBJS)/conduit.o \
-#			 $(CPP_OBJS)/connectCallbacks.o $(CPP_OBJS)/connectGroup.o \
-#			 $(CPP_OBJS)/connect.o $(CPP_OBJS)/exceptionsHelper.o $(CPP_OBJS)/granules.o $(CPP_OBJS)/handleHelper.o \
-#			 $(CPP_OBJS)/helper.o \
-#			 $(CPP_OBJS)/loadCollectionXMLParser.o $(CPP_OBJS)/loadGroupXMLParser.o $(CPP_OBJS)/methodCallbacks.o \
-#			 $(CPP_OBJS)/policyHelper.o \
-#			 $(CPP_OBJS)/restorePVGroupXMLParser.o $(CPP_OBJS)/transpose.o
-
-
-CAFE_OBJS_DIR = $(CAFE_BASE)/cpp/$(CAFE_VERSION)/lib/libcafe.a
-
-# MATLAB Versions 2014 onwards, use
-# LDFLAGS='$(LIB_LOCAL) $(LIBS) instead of $(LIB_LOCAL) $(LIBS)
-# LDFLAGS='$(LIB_LOCAL) $(LIBS) instead of $(LIB_INSTALL) $(LIBS)
-
-
-$(OBJ_DIR)/mocha.$(MEXE): mocha.cpp $(OBJ_DIR)/macchinettaSwitch.o
-	mex  -largeArrayDims CXXFLAGS='-v -largeArrayDims -ansi -fexceptions -fPIC -fno-omit-frame-pointer -pthread' \
-	mocha.cpp $(OBJ_DIR)/macchinettaSwitch.o $(CAFE_OBJS_DIR) -outdir $(OBJ_DIR) -output mocha.$(MEXE) \
- 	$(INCLUDEPATH_MOCHA) \
-	LDFLAGS='$(LIB_LOCAL) $(LIBS)'	
- 
- 
- 
-#$(OBJ_DIR)/libmacchinetta.so: $(OBJ_DIR)/macchinettaSwitch.o 
-#	g++ -shared -Wl,-soname,libmacchinetta.so \
-#	    $(OBJ_DIR)/macchinettaSwitch.o  -o $(OBJ_DIR)/libmacchinetta.so
-
-
-$(OBJ_DIR)/macchinettaSwitch.o: macchinettaSwitch.cpp macchinettaHelper.h \
-					macchinetta.h containerMochaccino.h
-	mex   CXXFLAGS='-v -largeArrayDims -ansi -fexceptions -fPIC -fno-omit-frame-pointer -pthread' \
-	 -c macchinettaSwitch.cpp $(INCLUDEPATH_MACHINETTA) -outdir $(OBJ_DIR)   
-	
-install: $(OBJ_DIR)/mocha.$(MEXE)
-	mkdir -p $(INSTALL_PATH)
-	mex CXXFLAGS='-v -largeArrayDims -ansi -fexceptions -fPIC -fno-omit-frame-pointer -pthread' \
-	mocha.cpp $(OBJ_DIR)/macchinettaSwitch.o $(CAFE_OBJS_DIR) -outdir $(INSTALL_PATH) -output mocha.$(MEXE) \
- 	$(INCLUDEPATH_MOCHA) \
-	LDFLAGS='$(LIB_INSTALL) $(LIBS)'
-	cp example.m $(INSTALL_PATH)
-	cp scripts/monitorAction.m $(INSTALL_PATH)
-	cp scripts/pvtable.m $(INSTALL_PATH)
-	cp scripts/test.xml  $(INSTALL_PATH)
-	
-install_lib: $(OBJ_DIR)/libmacchinetta.so
-	mkdir -p $(INSTALL_PATH)
-	cp $(OBJ_DIR)/libmacchinetta.so  $(INSTALL_PATH)
-
-clean:
-	rm -f $(OBJ_DIR)/*.o $(OBJ_DIR)/*.so $(OBJ_DIR)/*.$(MEXE)
-

makefile

@@ -0,0 +1 @@
+makefile_rel_1.13-gcc-6.3.0

makefile_rel_2014_win.make

@@ -1,70 +0,0 @@
-MATLAB_ROOT=C:\'Program Files'\MATLAB\R2016b_x64
-MEXE=mexw64
-#c:\local\boost_1_62_0\
-
-INCLUDES = -IC:\CAFE\CAFE\cpp\include -IC:\CAFE\CAFE\cpp -IC:\local\boost_1_62_0 \
--IC:\local\boost_1_62_0\boost  -IC:\epics\base-3.14.12.5\include -IC:\epics\base-3.14.12.5\include\os\WIN32 \
--I"C:\Program Files\MATLAB\R2016b_x64\extern\include" \
--Ic:\Qt\qt-4.8.6-x64-msvc2010\include -Ic:\Qt\qt-4.8.6-x64-msvc2010\include\QtCore -Ic:\Qt\qt-4.8.6-msvc2010\include\QtXml
-
-CXX=cl
-CXXFLAGS = /W4 /EHsc
-OUTPUT_OPTION = /o $@
-LIB_LOCAL = C:\epics\base-3.14.12.5\lib\windows-x64\Com.lib C:\epics\base-3.14.12.5\lib\windows-x64\ca.lib \
-C:\CAFE\CAFE\cpp\cafe.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_thread-vc100-mt-1_62.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_system-vc100-mt-1_62.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_chrono-vc100-mt-1_62.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_date_time-vc100-mt-1_62.lib \
-C:\Qt\Qt-4.8.6-msvc2010\lib\QtCore4.lib C:\Qt\tq-4.8.6-msvc2010\lib\QtXml4.lib 
-#"C:\Program Files\MATLAB\R2016b_x64\extern\lib\win64\microsoft\libmat.lib" \
-#"C:\Program Files\MATLAB\R2016b_x64\extern\lib\win64\microsoft\libmex.lib" \
-#"C:\Program Files\MATLAB\R2016b_x64\extern\lib\win64\microsoft\libmx.lib"
-
-LIB_CAFE=C:\CAFE\CAFE\cpp\cafe.lib
-LIB_BOOST =C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_date_time-vc100-mt-1_62.lib 
-
-LIB_BOOST2=C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_date_time-vc100-mt-s-1_62.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_thread-vc100-mt-s-1_62.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_system-vc100-mt-s-1_62.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_chrono-vc100-mt-s-1_62.lib
-
-#LIB_BOOST2=C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_thread-vc100-mt-s-1_62.lib \
-#C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_system-vc100-mt-s-1_62.lib \
-#C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_date_time-vc100-mt-s-1_62.lib \
-#C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_chrono-vc100-mt-s-1_62.lib
-
-#LIB_BOOST=C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_thread-vc100-mt-1_62.lib \
-#C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_system-vc100-mt-1_62.lib \
-#C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_date_time-vc100-mt-1_62.lib \
-#C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_chrono-vc100-mt-1_62.lib
-
-LIB_QT=C:\Qt\Qt-4.8.6-x64-msvc2010\lib\QtCore4.lib C:\Qt\qt-4.8.6-x64-msvc2010\lib\QtXml4.lib 
-
-LIB_EPICS=C:\epics\base-3.14.12.5\lib\windows-x64\Com.lib C:\epics\base-3.14.12.5\lib\windows-x64\ca.lib
-
-OBJ_DIR=windows-x64
-
-CAFE_OBJS  = C:\CAFE\CAFE\cpp\src\cafeCache.obj C:\CAFE\CAFE\cpp\src\cafeGroup.obj C:\CAFE\CAFE\cpp\src\cafe.obj C:\CAFE\CAFE\cpp\src\cafeVectors.obj \
-			 C:\CAFE\CAFE\cpp\src\cafeXML.obj C:\CAFE\CAFE\cpp\src\callbackHandlerCreate.obj C:\CAFE\CAFE\cpp\src\callbackHandlerMonitor.obj \
-			 C:\CAFE\CAFE\cpp\src\conduitGroup.obj C:\CAFE\CAFE\cpp\src\conduit.obj \
-			 C:\CAFE\CAFE\cpp\src\connectCallbacks.obj C:\CAFE\CAFE\cpp\src\connectGroup.obj \
-			 C:\CAFE\CAFE\cpp\src\connect.obj C:\CAFE\CAFE\cpp\src\exceptionsHelper.obj C:\CAFE\CAFE\cpp\src\granules.obj C:\CAFE\CAFE\cpp\src\handleHelper.obj \
-			 C:\CAFE\CAFE\cpp\src\helper.obj \
-			 C:\CAFE\CAFE\cpp\src\loadCollectionXMLParser.obj C:\CAFE\CAFE\cpp\src\loadGroupXMLParser.obj C:\CAFE\CAFE\cpp\src\methodCallbacks.obj \
-			 C:\CAFE\CAFE\cpp\src\policyHelper.obj \
-			 C:\CAFE\CAFE\cpp\src\restorePVGroupXMLParser.obj C:\CAFE\CAFE\cpp\src\transpose.obj
-
-#\NODEFAULTLIB
-$(OBJ_DIR)\mocha.$(MEXE): mocha.cpp $(OBJ_DIR)\macchinettaSwitch.obj 
-	"C:\Program Files\MATLAB\R2016b_x64\bin\win64\mex"  -v COMPFLAGS="$(COMPFLAGS) -Wall" mocha.cpp $(OBJ_DIR)/macchinettaSwitch.obj -DDB_TEXT_GLBLSOURCE -DMSCC -DWIN32 -DWIN64 -largeArrayDims  $(INCLUDES) $(LIB_EPICS) $(LIB_CAFE) $(LIB_BOOST) $(LIB_BOOST2) $(LIB_QT) \
-	-outdir $(OBJ_DIR) -output mocha.$(MEXE)
- 
-$(OBJ_DIR)\macchinettaSwitch.obj: macchinettaSwitch.cpp macchinettaHelper.h \
-					macchinetta.h containerMochaccino.h 
-	"C:\Program Files\MATLAB\R2016b_x64\bin\win64\mex"  -largeArrayDims \
-	-c macchinettaSwitch.cpp $(INCLUDES) -outdir $(OBJ_DIR)   
-	
-clean:
-	rm -f $(OBJ_DIR)/*.obj $(OBJ_DIR)/*.$(MEXE)
-