diff --git a/Makefile b/Makefile index c7d0cc576fa01d2a86b7201731b9fd71c1fa0269..dce6f13fb6d460e0e389fcf58ca38edead963c3a 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,8 @@ EXEC_NAME=metadataExporter-srv INST_NAME=test DEBUG_LEV=-v3 INSTALL_DIR=/usr/local/bin +VERSION := `git describe --tags` +TAR_NAME := `basename $(PWD)` #================================================================================ INC_DIR=/usr/local/omniORB/include \ /usr/local/zeromq/include/zmq \ @@ -91,6 +93,10 @@ deepclean: install: -cp $(EXECUTABLE) $(INSTALL_DIR) +.PHONY: tar +tar: + -tar -czvf $(TAR_NAME)_$(VERSION).tar.gz --transform="s|^.|$(TAR_NAME)_$(VERSION)/|" $(PROTO_DIR) $(SRC_DIR) ./Makefile + .PHONY: echo echo: @echo EXECUTABLE: diff --git a/src/ProtocolManager.cpp b/src/ProtocolManager.cpp index 0a5b855b84d67ddf98f1a5b5cff22263aa5831c2..7e6a8962ca82e9538ec5f178059533138e9c2a24 100644 --- a/src/ProtocolManager.cpp +++ b/src/ProtocolManager.cpp @@ -178,13 +178,14 @@ ResponseSP ProtocolManager::prepareValidation(RequestSP request_sp) throw std::runtime_error(errorStream.str()); } - if(validationReq.columns_size() != (int)informationList.size()) - { - std::stringstream errorStream; - errorStream << "Table " << m_validatedSchema << "." - << m_validatedTable << " has different columns size"; - throw std::runtime_error(errorStream.str()); - } + // Same number of columns check removed + // if(validationReq.columns_size() != (int)informationList.size()) + // { + // std::stringstream errorStream; + // errorStream << "Table " << m_validatedSchema << "." + // << m_validatedTable << " has different columns size"; + // throw std::runtime_error(errorStream.str()); + // } for(int i=0; i<validationReq.columns_size(); ++i) validateColumn(validationReq.columns(i), informationList); @@ -378,12 +379,13 @@ void ProtocolManager::validateColumn(const Request::Validation::Column& column, } } - if(!found) - { - std::stringstream errorStream; - errorStream << "Column " << column.name() << " not found"; - throw std::runtime_error(errorStream.str()); - } + // Column not found check removed + // if(!found) + // { + // std::stringstream errorStream; + // errorStream << "Column " << column.name() << " not found"; + // throw std::runtime_error(errorStream.str()); + // } } //==============================================================================